Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit44f64dd

Browse files
committed
Makefile cleanup for interface tree. Now essentially with all the
standard targets and behaviour. Replaced Makefile.in's withMakefile's and declared the respective variables in Makefile.global.maintainer-clean target now available at top level, although it doesnot work in the backend tree yet.Cleanup pass over Makefile.shlib, renamed some targets and variables.The shared library symlink tests are now done by make, not the shell.ecpg: Remove one warning in sloppy flex output.PL/Perl and Perl interface: the MakeMaker documentation is confusing,the realclean target *does* "delete derived files", but it alsouninstalls them. Don't use that.The submake targets in the various bin directories that update libpqshould `make all', not `make libpq.a'. That is a) unportable, andb) doesn't build the shared library.
1 parent5ac1eac commit44f64dd

File tree

32 files changed

+702
-754
lines changed

32 files changed

+702
-754
lines changed

‎GNUmakefile.in

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.5 2000/06/14 18:17:24 petere Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.6 2000/06/28 18:29:11 petere Exp $
55
#
66

7-
srcdir = @srcdir@
8-
VPATH = @srcdir@
9-
10-
top_srcdir = @top_srcdir@
7+
subdir =
118
top_builddir = .
12-
9+
include src/Makefile.global
1310

1411
all:
1512
$(MAKE) -C src all
@@ -19,17 +16,17 @@ install:
1916
$(MAKE) -C src install
2017
@cat $(srcdir)/register.txt
2118

19+
installdirs uninstall:
20+
$(MAKE) -C src $@
21+
2222
clean:
2323
$(MAKE) -C src clean
2424

25-
distclean:
26-
-$(MAKE) -C srcdistclean
25+
distclean maintainer-clean:
26+
-$(MAKE) -C src$@
2727
-rm -f config.cache config.log config.status GNUmakefile
2828

2929

30-
.PHONY: all install clean distclean
31-
32-
3330
GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
3431
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
3532

‎configure

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2363,7 +2363,7 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS"
23632363

23642364

23652365

2366-
forac_proginmawkgawk nawk awk
2366+
forac_progin gawk mawk nawk awk
23672367
do
23682368
# Extract the first word of "$ac_prog", so it can be a program name with args.
23692369
set dummy$ac_prog; ac_word=$2
@@ -8883,16 +8883,6 @@ trap 'rm -fr `echo "GNUmakefile
88838883
src/bin/pgtclsh/mkMakefile.tcldefs.sh
88848884
src/bin/pgtclsh/mkMakefile.tkdefs.sh
88858885
src/include/version.h
8886-
src/interfaces/Makefile
8887-
src/interfaces/libpq/Makefile
8888-
src/interfaces/ecpg/lib/Makefile
8889-
src/interfaces/ecpg/preproc/Makefile
8890-
src/interfaces/perl5/GNUmakefile
8891-
src/interfaces/libpq++/Makefile
8892-
src/interfaces/libpgeasy/Makefile
8893-
src/interfaces/libpgtcl/Makefile
8894-
src/interfaces/odbc/GNUmakefile
8895-
src/interfaces/python/GNUmakefile
88968886
src/pl/tcl/mkMakefile.tcldefs.sh
88978887
src/test/regress/GNUmakefile
88988888
src/include/config.h"| sed"s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -9067,16 +9057,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
90679057
src/bin/pgtclsh/mkMakefile.tcldefs.sh
90689058
src/bin/pgtclsh/mkMakefile.tkdefs.sh
90699059
src/include/version.h
9070-
src/interfaces/Makefile
9071-
src/interfaces/libpq/Makefile
9072-
src/interfaces/ecpg/lib/Makefile
9073-
src/interfaces/ecpg/preproc/Makefile
9074-
src/interfaces/perl5/GNUmakefile
9075-
src/interfaces/libpq++/Makefile
9076-
src/interfaces/libpgeasy/Makefile
9077-
src/interfaces/libpgtcl/Makefile
9078-
src/interfaces/odbc/GNUmakefile
9079-
src/interfaces/python/GNUmakefile
90809060
src/pl/tcl/mkMakefile.tcldefs.sh
90819061
src/test/regress/GNUmakefile
90829062
"}

‎configure.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,16 +1202,6 @@ AC_OUTPUT(
12021202
src/bin/pgtclsh/mkMakefile.tcldefs.sh
12031203
src/bin/pgtclsh/mkMakefile.tkdefs.sh
12041204
src/include/version.h
1205-
src/interfaces/Makefile
1206-
src/interfaces/libpq/Makefile
1207-
src/interfaces/ecpg/lib/Makefile
1208-
src/interfaces/ecpg/preproc/Makefile
1209-
src/interfaces/perl5/GNUmakefile
1210-
src/interfaces/libpq++/Makefile
1211-
src/interfaces/libpgeasy/Makefile
1212-
src/interfaces/libpgtcl/Makefile
1213-
src/interfaces/odbc/GNUmakefile
1214-
src/interfaces/python/GNUmakefile
12151205
src/pl/tcl/mkMakefile.tcldefs.sh
12161206
src/test/regress/GNUmakefile
12171207
)

‎src/GNUmakefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.53 2000/06/27 00:30:48 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.54 2000/06/28 18:29:13 petere Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -56,7 +56,7 @@ distclean maintainer-clean:
5656
rm -f backend/port/Makefile backend/catalog/genbki.sh \
5757
backend/utils/Gen_fmgrtab.sh \
5858
backend/port/tas.s backend/port/dynloader.c
59-
-$(MAKE) -C interfacesdistclean
59+
-$(MAKE) -C interfaces$@
6060
-$(MAKE) -C bin $@
6161
-$(MAKE) -C pl $@
6262
-$(MAKE) -C test clean

‎src/Makefile.global.in

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.81 2000/06/27 00:30:48 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.82 2000/06/28 18:29:13 petere Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -86,6 +86,8 @@ localstatedir = @localstatedir@
8686
libdir = @libdir@
8787
includedir = @includedir@
8888

89+
odbcinst_ini_dir = @odbcinst_ini_dir@
90+
8991
# old variable names for installation directories
9092

9193
POSTGRESDIR= $(prefix)
@@ -112,7 +114,14 @@ ENFORCE_ALIGNMENT= true
112114
#PROFILE= -p -non_shared
113115

114116

117+
with_CXX = @with_CXX@
115118
with_perl = @with_perl@
119+
enable_odbc = @enable_odbc@
120+
121+
with_python = @with_python@
122+
PYTHON = @PYTHON@
123+
python_extmakefile = @python_extmakefile@
124+
python_moduledir = @python_moduledir@
116125

117126
#
118127
# Please do not edit USE_TCL and USE_TK by hand.
@@ -172,6 +181,8 @@ LN_S= @LN_S@
172181
TAR= @tar@
173182
GZCAT= @GZCAT@
174183
PERL = @PERL@
184+
CXX=@CXX@
185+
CXXFLAGS=@CXXFLAGS@ @INCLUDES@
175186

176187

177188
##############################################################################
@@ -260,10 +271,10 @@ endif
260271

261272

262273
# substitute implementations of the C library
274+
INET_ATON = @INET_ATON@
263275
STRERROR = @STRERROR@
264276
STRERROR2 = @STRERROR2@
265277
SNPRINTF = @SNPRINTF@
266278
STRDUP = @STRDUP@
267279

268-
.DEFAULT: all
269280
.PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp