diff options
| author | Tom Lane | 2000-05-29 05:45:56 +0000 |
|---|---|---|
| committer | Tom Lane | 2000-05-29 05:45:56 +0000 |
| commit | 091126fa28b4dbfd9df2fc4c22deade58f7e24dc (patch) | |
| tree | 5a4c362f26fa5b00688831ffdf1dfff8b0f60f1f | |
| parent | 18952f67446da73f938d213b5225b99e95657837 (diff) | |
Generated header files parse.h and fmgroids.h are now copied into
the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.
91 files changed, 193 insertions, 399 deletions
diff --git a/contrib/Makefile b/contrib/Makefile index 7485110ed5f..0dc68e48549 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -11,42 +11,18 @@ # The following subdirs give make errors: # # earthdistance -# findoidjoins -# isbn_issn # os2client -# pginterface -all: - for dir in *; do \ - if [ -e $$dir/Makefile ]; then \ - $(MAKE) -C $$dir; \ - fi; \ - done - -install: +all: for dir in *; do \ if [ -e $$dir/Makefile ]; then \ $(MAKE) -C $$dir $@ ; \ fi; \ done -install-doc: - for dir in *; do \ - if [ -e $$dir/Makefile ]; then \ - $(MAKE) -C $$dir $@ ; \ - fi; \ - done || exit 0 - -clean: - for dir in *; do \ - if [ -e $$dir/Makefile ]; then \ - $(MAKE) -C $$dir $@ ; \ - fi; \ - done || exit 0 - -distclean: +.DEFAULT: for dir in *; do \ if [ -e $$dir/Makefile ]; then \ $(MAKE) -C $$dir $@ ; \ fi; \ - done || exit 0 + done diff --git a/contrib/array/Makefile b/contrib/array/Makefile index 951250a29dd..c29569d76f5 100644 --- a/contrib/array/Makefile +++ b/contrib/array/Makefile @@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I./ \ - -I$(SRCDIR)/ \ - -I$(SRCDIR)/include \ - -I$(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL) +CFLAGS += -I. $(CFLAGS_SL) MODNAME = array_iterator @@ -61,7 +56,7 @@ $(SQLDIR): $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f *~ $(MODULE) $(MODNAME).sql diff --git a/contrib/datetime/Makefile b/contrib/datetime/Makefile index 195c0f8d689..8f43ff83b7b 100644 --- a/contrib/datetime/Makefile +++ b/contrib/datetime/Makefile @@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I./ \ - -I$(SRCDIR)/ \ - -I$(SRCDIR)/include \ - -I$(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL) +CFLAGS += -I. $(CFLAGS_SL) MODNAME = datetime_functions @@ -61,7 +56,7 @@ $(SQLDIR): $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f *~ $(MODULE) $(MODNAME).sql diff --git a/contrib/datetime/datetime_functions.c b/contrib/datetime/datetime_functions.c index 47991a8646d..ca9c8afe35e 100644 --- a/contrib/datetime/datetime_functions.c +++ b/contrib/datetime/datetime_functions.c @@ -96,7 +96,7 @@ hhmm_in(char *str) *tm = &tt; if (!PointerIsValid(str)) - elog(ERROR, "Bad (null) time external representation", NULL); + elog(ERROR, "Bad (null) time external representation"); if (decode_24h_time(str, tm, &fsec) != 0) elog(ERROR, "Bad time external representation '%s'", str); diff --git a/contrib/datetime/datetime_functions.h b/contrib/datetime/datetime_functions.h index c345f2852b8..4b0eb499884 100644 --- a/contrib/datetime/datetime_functions.h +++ b/contrib/datetime/datetime_functions.h @@ -15,6 +15,7 @@ int4 date_month(DateADT val); int4 date_year(DateADT val); TimeADT *currenttime(void); DateADT currentdate(void); +int4 date2mjd(DateADT val); #endif diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile index c5986b02f76..bf1d02d227c 100644 --- a/contrib/fulltextindex/Makefile +++ b/contrib/fulltextindex/Makefile @@ -4,7 +4,7 @@ include $(SRCDIR)/Makefile.global CONTRIBDIR=$(LIBDIR)/contrib -CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include +CFLAGS+= $(CFLAGS_SL) TARGETS= fti$(DLSUFFIX) CLEANFILES+= $(TARGETS) diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile index baccaf28e6c..bd3c4325cd2 100644 --- a/contrib/isbn_issn/Makefile +++ b/contrib/isbn_issn/Makefile @@ -1,25 +1,18 @@ # # PostgreSQL types for ISBN and ISSN identifiers. # -# $Id: Makefile,v 1.1 1998/08/17 03:35:04 scrappy Exp $ +# $Id: Makefile,v 1.2 2000/05/29 05:44:26 tgl Exp $ -all: isbn.so issn.so +SRCDIR= ../../src -isbn.so: isbn.o - ld -Bshareable -o isbn.so isbn.o +include $(SRCDIR)/Makefile.global -isbn.o: isbn.c - cc -g -O -fPIC -I/usr/local/pgsql/include -c isbn.c +CFLAGS+= $(CFLAGS_SL) -issn.so: issn.o - ld -Bshareable -o issn.so issn.o +all: isbn$(DLSUFFIX) issn$(DLSUFFIX) -issn.o: issn.c - cc -g -O -fPIC -I/usr/local/pgsql/include -c issn.c +install: isbn$(DLSUFFIX) issn$(DLSUFFIX) + install -c isbn$(DLSUFFIX) issn$(DLSUFFIX) /usr/local/pgsql/modules -install: isbn.so issn.so - install -c isbn.so issn.so /usr/local/pgsql/modules - -# -# eof -# +clean: + rm -f isbn$(DLSUFFIX) issn$(DLSUFFIX) *.o diff --git a/contrib/isbn_issn/isbn.c b/contrib/isbn_issn/isbn.c index 5f4ac889051..ff63381255c 100644 --- a/contrib/isbn_issn/isbn.c +++ b/contrib/isbn_issn/isbn.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for ISBNs. * - * $Id: isbn.c,v 1.2 1999/05/25 16:05:40 momjian Exp $ + * $Id: isbn.c,v 1.3 2000/05/29 05:44:26 tgl Exp $ */ #include <stdio.h> @@ -47,8 +47,6 @@ isbn * isbn_in(char *str) { isbn *result; - char *cp; - int count; if (strlen(str) != 13) { diff --git a/contrib/isbn_issn/issn.c b/contrib/isbn_issn/issn.c index ccb264ac8f7..145f4e38f44 100644 --- a/contrib/isbn_issn/issn.c +++ b/contrib/isbn_issn/issn.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for ISSNs. * - * $Id: issn.c,v 1.2 1999/05/25 16:05:42 momjian Exp $ + * $Id: issn.c,v 1.3 2000/05/29 05:44:26 tgl Exp $ */ #include <stdio.h> @@ -47,8 +47,6 @@ issn * issn_in(char *str) { issn *result; - char *cp; - int count; if (strlen(str) != 9) { diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile index 8bd08a3350c..e091049293b 100644 --- a/contrib/lo/Makefile +++ b/contrib/lo/Makefile @@ -3,7 +3,7 @@ # # Makefile pinched from the ip-mac contrib package # -# $Id: Makefile,v 1.1 1998/06/16 07:07:11 momjian Exp $ +# $Id: Makefile,v 1.2 2000/05/29 05:44:27 tgl Exp $ SRCDIR= ../../src @@ -11,7 +11,7 @@ include $(SRCDIR)/Makefile.global CONTRIBDIR=$(LIBDIR)/modules -CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include +CFLAGS+= $(CFLAGS_SL) ifdef REFINT_VERBOSE CFLAGS+= -DREFINT_VERBOSE diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile index fd0065b86ef..742db0334f5 100644 --- a/contrib/miscutil/Makefile +++ b/contrib/miscutil/Makefile @@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I./ \ - -I$(SRCDIR)/ \ - -I$(SRCDIR)/include \ - -I$(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL) +CFLAGS += -I. $(CFLAGS_SL) MODNAME = misc_utils @@ -61,7 +56,7 @@ $(SQLDIR): $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f *~ $(MODULE) $(MODNAME).sql diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c index 302118689dc..f5a98683280 100644 --- a/contrib/miscutil/misc_utils.c +++ b/contrib/miscutil/misc_utils.c @@ -15,6 +15,7 @@ #include <errno.h> #include "postgres.h" + #include "access/heapam.h" #include "access/htup.h" #include "access/relscan.h" @@ -22,14 +23,16 @@ #include "access/tupdesc.h" #include "catalog/catname.h" #include "catalog/pg_listener.h" +#include "fmgr.h" #include "storage/lmgr.h" -#include "utils/fmgr.h" +#include "utils/fmgroids.h" #include "utils/palloc.h" #include "utils/rel.h" #include "utils/tqual.h" #include "misc_utils.h" +#undef MIN #define MIN(x,y) ((x)<=(y) ? (x) : (y)) extern int ExecutorLimit(int limit); diff --git a/contrib/odbc/Makefile b/contrib/odbc/Makefile index 34138c1f321..8fe1959c58d 100644 --- a/contrib/odbc/Makefile +++ b/contrib/odbc/Makefile @@ -9,7 +9,7 @@ ifndef PGLIB PGLIB= . endif -CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include +CFLAGS+= $(CFLAGS_SL) TARGETS_7= odbc.sql TARGETS_PRE7= odbc$(DLSUFFIX) odbc-pre7.sql diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index c2b027c9ecc..76ac80d68f4 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.3 2000/04/12 17:14:27 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pgbench/pgbench.c,v 1.4 2000/05/29 05:44:29 tgl Exp $ * * pgbench: a simple TPC-B like benchmark program for PostgreSQL * written by Tatsuo Ishii @@ -591,7 +591,7 @@ main(int argc, char **argv) } if (rlim.rlim_cur <= (nclients + 2)) { - fprintf(stderr, "You need at least %d open files resource but you are only allowed to use %ld.\n", nclients + 2, rlim.rlim_cur); + fprintf(stderr, "You need at least %d open files resource but you are only allowed to use %ld.\n", nclients + 2, (long) rlim.rlim_cur); fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n"); exit(1); } diff --git a/contrib/soundex/Makefile b/contrib/soundex/Makefile index d95549dc01f..059fd6d4ee4 100644 --- a/contrib/soundex/Makefile +++ b/contrib/soundex/Makefile @@ -10,25 +10,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I ./ \ - -I $(SRCDIR)/ \ - -I $(SRCDIR)/include \ - -I $(SRCDIR)/interfaces/libpq \ - -I $(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) - -ifeq ($(PORTNAME), linux) - ifdef LINUX_ELF - ifeq ($(CC), gcc) - CFLAGS += -fPIC - endif - endif -endif - -ifeq ($(PORTNAME), i386_solaris) - CFLAGS+= -fPIC -endif +CFLAGS += -I. $(CFLAGS_SL) MODNAME = soundex @@ -53,7 +35,7 @@ install: $(MODULE) $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f $(MODULE) $(MODNAME).sql diff --git a/contrib/soundex/soundex.c b/contrib/soundex/soundex.c index df0c8366b95..8fe73054caf 100644 --- a/contrib/soundex/soundex.c +++ b/contrib/soundex/soundex.c @@ -2,23 +2,21 @@ /* soundex.c */ /*****************************************************************************/ +#include <ctype.h> #include <string.h> #include <stdio.h> + #include "postgres.h" /* for char16, etc. */ + #include "utils/palloc.h" /* for palloc */ -#include "libpq-fe.h" /* for TUPLE */ -#include <stdio.h> -#include <ctype.h> -/* prototype for soundex function */ +/* prototypes for soundex functions */ +text *text_soundex(text *t); char *soundex(char *instr, char *outstr); text * text_soundex(text *t) { - /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ - char *table = "01230120022455012623010202"; - int count = 0; text *new_t; char outstr[6 + 1]; /* max length of soundex is 6 */ @@ -49,7 +47,8 @@ text_soundex(text *t) char * soundex(char *instr, char *outstr) -{ /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ +{ + /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ char *table = "01230120022455012623010202"; int count = 0; diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index e4deb393d43..639a6247dae 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -3,7 +3,7 @@ SRCDIR= ../../src include $(SRCDIR)/Makefile.global -CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include +CFLAGS+= $(CFLAGS_SL) ifdef REFINT_VERBOSE CFLAGS+= -DREFINT_VERBOSE diff --git a/contrib/string/Makefile b/contrib/string/Makefile index dd8f0e6f2a6..d372aa08457 100644 --- a/contrib/string/Makefile +++ b/contrib/string/Makefile @@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I./ \ - -I$(SRCDIR)/ \ - -I$(SRCDIR)/include \ - -I$(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL) +CFLAGS += -I. $(CFLAGS_SL) MODNAME = string_io @@ -61,7 +56,7 @@ $(SQLDIR): $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f *~ $(MODULE) $(MODNAME).sql diff --git a/contrib/string/string_io.c b/contrib/string/string_io.c index cb8323d9c9b..c329fec1e9e 100644 --- a/contrib/string/string_io.c +++ b/contrib/string/string_io.c @@ -22,6 +22,7 @@ /* define this if you want to see iso-8859 characters */ #define ISO8859 +#undef MIN #define MIN(x, y) ((x) < (y) ? (x) : (y)) #define VALUE(char) ((char) - '0') #define DIGIT(val) ((val) + '0') diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile index 23975185b2a..983f20a547c 100644 --- a/contrib/userlock/Makefile +++ b/contrib/userlock/Makefile @@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I./ \ - -I$(SRCDIR)/ \ - -I$(SRCDIR)/include \ - -I$(SRCDIR)/port/$(PORTNAME) - -CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL) +CFLAGS += -I. $(CFLAGS_SL) MODNAME = user_locks @@ -61,7 +56,7 @@ $(SQLDIR): $(CC) $(CFLAGS) -shared -o $@ $< depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f *~ $(MODULE) $(MODNAME).sql diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile index 95214acb982..c9484024b58 100644 --- a/contrib/vacuumlo/Makefile +++ b/contrib/vacuumlo/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.1 1999/04/10 16:48:04 peter Exp $ +# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.2 2000/05/29 05:44:32 tgl Exp $ SRCDIR= ../../src @@ -6,7 +6,7 @@ include $(SRCDIR)/Makefile.global CONTRIBDIR=$(LIBDIR)/contrib -CFLAGS+= -I$(HEADERDIR) +CFLAGS+= -I$(LIBPQDIR) TARGETS= vacuumlo CLEANFILES+= $(TARGETS) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index afeadbc6f4d..db3a3233454 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.74 2000/05/27 04:13:04 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.75 2000/05/29 05:44:32 tgl Exp $ # # NOTES # Essentially all Postgres make files include this file and use the @@ -208,7 +208,7 @@ YFLAGS= @YFLAGS@ YACC= @YACC@ LEX= @LEX@ AROPT= @AROPT@ -CFLAGS= -I$(SRCDIR)/include -I$(SRCDIR)/backend @CPPFLAGS@ @CFLAGS@ +CFLAGS= -I$(SRCDIR)/include @CPPFLAGS@ @CFLAGS@ CFLAGS_SL= @SHARED_LIB@ PGSQL_INCLUDES= @PGSQL_INCLUDES@ LIBS= @LIBS@ diff --git a/src/backend/Makefile b/src/backend/Makefile index 6af51106bd3..ee068ef1de8 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -29,12 +29,12 @@ # # We don't use $(LD) for linking. We use $(CC) instead. This is because # the $(CC) program apparently can do linking too, and it has certain -# thinks like default options and search paths for libraries set up for +# things like default options and search paths for libraries set up for # it that the more primitive $(LD) doesn't have. # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.48 2000/05/28 17:55:51 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.49 2000/05/29 05:44:33 tgl Exp $ # #------------------------------------------------------------------------- @@ -50,9 +50,11 @@ DIRS += tioga endif OBJS = $(DIRS:%=%/SUBSYS.o) + ifeq ($(PORTNAME), qnx4) -# This file chrashes wlink and is therefore not in bootstrap/SUBSYS.o. -OBJS1 = bootstrap/bootstrap.o +# This file crashes qnx4's wlink and is therefore not in bootstrap/SUBSYS.o +# on that platform. (Wotta hack ... is it still necessary?) +OBJS+= bootstrap/bootstrap.o endif VERSIONOBJ = $(SRCDIR)/utils/version.o @@ -75,22 +77,25 @@ libpostgres.a: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ endif -all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \ - global1.description local1_template1.description +all: prebuildheaders postgres $(POSTGRES_IMP) \ + global1.bki.source local1_template1.bki.source \ + global1.description local1_template1.description ifneq ($(PORTNAME), win) -postgres: utils/fmgroids.h $(OBJS) $(VERSIONOBJ) - $(CC) $(CFLAGS) -o postgres $(OBJS) $(OBJS1) $(VERSIONOBJ) $(LDFLAGS) + +postgres: $(OBJS) $(VERSIONOBJ) + $(CC) $(CFLAGS) -o postgres $(OBJS) $(VERSIONOBJ) $(LDFLAGS) + else + postgres: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def libpostgres.a dlltool --dllname $@$(X) --output-exp [email protected] --def postgres.def gcc -g -o $@$(X) -Wl,--base-file,[email protected] [email protected] $(DLLOBJS) $(DLLLIBS) dlltool --dllname $@$(X) --base-file [email protected] --output-exp [email protected] --def postgres.def gcc -g -o $@$(X) [email protected] $(DLLOBJS) $(DLLLIBS) -endif -#.PHONY: postgres +endif $(OBJS): $(DIRS:%=%.dir) @@ -114,24 +119,36 @@ catalog/global1.description catalog/local1_template1.description: # The postgres.o target is needed by the rule in Makefile.global that # creates the exports file when MAKE_EXPORTS = true. postgres.o: $(OBJS) - $(CC) $(LDREL) $(LDOUT) postgres.o $(OBJS) $(OBJS1) $(LDFLAGS) + $(CC) $(LDREL) $(LDOUT) postgres.o $(OBJS) $(LDFLAGS) + +# These header files should be up-to-date before we do much else... +.PHONY: prebuildheaders + +prebuildheaders: $(SRCDIR)/include/parser/parse.h \ + $(SRCDIR)/include/utils/fmgroids.h ############################################################################ # The following targets are specified in make commands that appear in the -# make files in our subdirectories. +# make files in our subdirectories. Note that it's important we match the +# dependencies shown in the subdirectory makefiles! -parse.h: parser/parse.h - cp parser/parse.h . +$(SRCDIR)/include/parser/parse.h: parser/parse.h + cp parser/parse.h $(SRCDIR)/include/parser -parser/parse.h: +parser/parse.h: parser/gram.y $(MAKE) -C parser parse.h -utils/fmgroids.h: +$(SRCDIR)/include/utils/fmgroids.h: utils/fmgroids.h + cp utils/fmgroids.h $(SRCDIR)/include/utils + +utils/fmgroids.h: utils/Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h $(MAKE) -C utils fmgroids.h ############################################################################# clean: - rm -f postgres$(X) $(POSTGRES_IMP) parse.h \ + rm -f postgres$(X) $(POSTGRES_IMP) \ + $(SRCDIR)/include/parser/parse.h \ + $(SRCDIR)/include/utils/fmgroids.h \ global1.bki.source local1_template1.bki.source \ global1.description local1_template1.description ifeq ($(PORTNAME), win) @@ -141,6 +158,9 @@ endif endif for i in $(DIRS); do $(MAKE) -C $$i clean; done +depend dep: prebuildheaders + for i in $(DIRS); do $(MAKE) -C $$i $@; done + .DEFAULT: for i in $(DIRS); do $(MAKE) -C $$i $@; done @@ -202,7 +222,7 @@ install-templates: $(TEMPLATEDIR) \ $(INSTALL) $(INSTLOPTS) pg_options.sample \ $(TEMPLATEDIR)/pg_options.sample -install-headers: utils/fmgroids.h $(SRCDIR)/include/config.h +install-headers: prebuildheaders $(SRCDIR)/include/config.h -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi -@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi -@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \ @@ -239,7 +259,7 @@ install-headers: utils/fmgroids.h $(SRCDIR)/include/config.h $(HEADERDIR)/utils/geo_decls.h $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \ $(HEADERDIR)/utils/elog.h - $(INSTALL) $(INSTLOPTS) utils/fmgroids.h \ + $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/fmgroids.h \ $(HEADERDIR)/utils/fmgroids.h $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \ $(HEADERDIR)/utils/palloc.h @@ -284,7 +304,7 @@ endif # are up to date. It saves the time of doing all the submakes. .PHONY: quick quick: $(OBJS) - $(CC) -o postgres $(OBJS) $(OBJS1) $(LDFLAGS) + $(CC) -o postgres $(OBJS) $(LDFLAGS) # # Build the file, "./ID", used by the "gid" (grep-for-identifier) tool diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index 847b06b1d21..a721414c547 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,15 +4,13 @@ # Makefile for access/common # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.17 2000/05/28 17:55:52 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.18 2000/05/29 05:44:33 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS+=-I../.. - OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \ scankey.o tupdesc.o diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index 920443de0ef..795603473e1 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -4,15 +4,13 @@ # Makefile for access/gist # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.8 1999/12/13 22:32:21 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.9 2000/05/29 05:44:34 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = gist.o gistget.o gistscan.o giststrat.o all: SUBSYS.o diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index 07e81dae79f..b1736261658 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -4,15 +4,13 @@ # Makefile for access/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.8 1999/12/13 22:32:23 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.9 2000/05/29 05:44:35 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \ hashsearch.o hashstrat.o hashutil.o diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index 2671e52f538..50f891a7522 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,15 +4,13 @@ # Makefile for access/heap # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.9 1999/12/21 00:06:40 wieck Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.10 2000/05/29 05:44:35 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = heapam.o hio.o stats.o tuptoaster.o all: SUBSYS.o diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index 58b3ca34cb9..153ec74b0c0 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -4,15 +4,13 @@ # Makefile for access/index # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.8 1999/12/13 22:32:26 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.9 2000/05/29 05:44:38 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = genam.o indexam.o istrat.o all: SUBSYS.o diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index b93e14bbae0..3f0c678ac4f 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -4,15 +4,13 @@ # Makefile for access/nbtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.8 1999/12/13 22:32:28 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.9 2000/05/29 05:44:39 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \ nbtstrat.o nbtutils.o nbtsort.o diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile index 6310cf8a1e5..ad664c9b6ae 100644 --- a/src/backend/access/rtree/Makefile +++ b/src/backend/access/rtree/Makefile @@ -4,15 +4,13 @@ # Makefile for access/rtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.8 1999/12/13 22:32:30 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.9 2000/05/29 05:44:39 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o all: SUBSYS.o diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 785f9e39e89..fee5f491451 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,15 +4,13 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.10 1999/12/13 22:32:32 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.11 2000/05/29 05:44:41 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o all: SUBSYS.o diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index b9f9270416e..9cffe422f01 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -4,7 +4,7 @@ # Makefile for the bootstrap module # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.21 2000/01/19 02:58:51 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.22 2000/05/29 05:44:42 tgl Exp $ # # # We must build bootparse.c and bootscanner.c with yacc and lex and sed, @@ -19,9 +19,7 @@ #------------------------------------------------------------------------- SRCDIR= ../.. -include ../../Makefile.global - -CFLAGS += -I.. +include $(SRCDIR)/Makefile.global ifeq ($(CC), gcc) CFLAGS+= -Wno-error @@ -29,20 +27,18 @@ endif BOOTYACCS= bootstrap_tokens.h bootparse.c +ifneq ($(PORTNAME), qnx4) OBJS= bootparse.o bootscanner.o bootstrap.o -ifeq ($(PORTNAME), qnx4) -# wlink currently crashes with bootstrap.o -OBJS1= bootparse.o bootscanner.o +else +# qnx4's wlink currently crashes with bootstrap.o +OBJS= bootparse.o bootscanner.o endif -all: SUBSYS.o +# make sure bootstrap.o is built even on qnx4 +all: SUBSYS.o bootstrap.o SUBSYS.o: $(OBJS) -ifneq ($(PORTNAME), qnx4) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -else - $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS1) -endif # bootstrap.o's dependency on bootstrap_tokens.h is computed by the # make depend, but we state it here explicitly anyway because @@ -65,7 +61,7 @@ bootscanner.c: bootscanner.l rm -f lex.yy.c sedfile clean: - rm -f SUBSYS.o $(OBJS) + rm -f SUBSYS.o $(OBJS) bootstrap.o # And the garbage that might have been left behind by partial build: rm -f y.tab.h y.tab.c y.output lex.yy.c @@ -77,4 +73,3 @@ dep depend: bootparse.c bootscanner.c bootstrap_tokens.h ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 3dfe2c25d9d..307ebcc3cf2 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -4,15 +4,13 @@ # Makefile for catalog # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.20 1999/12/13 22:32:36 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.21 2000/05/29 05:44:43 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. - OBJS = catalog.o heap.o index.o indexing.o aclchk.o \ pg_aggregate.o pg_operator.o pg_proc.o pg_type.o diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index b0ee3f1e0df..c5916064609 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -4,14 +4,12 @@ # Makefile for commands # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.23 2000/01/19 02:58:51 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.24 2000/05/29 05:44:44 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. -include ../../Makefile.global - -CFLAGS += -I.. +include $(SRCDIR)/Makefile.global OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \ remove.o rename.o vacuum.o view.o cluster.o \ @@ -23,15 +21,6 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -# The following declares a hard-coded dependency on parse.h since, -# if compiled without make dep, comment.c would get compiled before -# the parser. - -comment.o: ../parse.h - -../parse.h: - $(MAKE) -C .. parse.h - depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 22ae1547691..2d7663d6d49 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.73 2000/05/29 01:59:06 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.74 2000/05/29 05:44:44 tgl Exp $ * * NOTES * The PortalExecutorHeapMemory crap needs to be eliminated @@ -51,7 +51,7 @@ #include "commands/comment.h" #include "access/genam.h" #include "optimizer/clauses.h" -#include "../parser/parse.h" +#include "parser/parse.h" #endif /* _DROP_COLUMN_HACK__ */ /* ---------------- diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile index 5d2f97fcee9..e0477405d56 100644 --- a/src/backend/executor/Makefile +++ b/src/backend/executor/Makefile @@ -4,15 +4,13 @@ # Makefile for executor # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.11 1999/12/13 22:32:40 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.12 2000/05/29 05:44:45 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. - OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \ execProcnode.o execQual.o execScan.o execTuples.o \ execUtils.o functions.o nodeAppend.o nodeAgg.o nodeHash.o \ diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index 2e43ba3f092..6b8a9d72022 100644 --- a/src/backend/lib/Makefile +++ b/src/backend/lib/Makefile @@ -4,17 +4,13 @@ # Makefile for lib (miscellaneous stuff) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.12 1999/12/13 22:32:41 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.13 2000/05/29 05:44:45 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) - OBJS = bit.o fstack.o hasht.o lispsort.o stringinfo.o dllist.o all: SUBSYS.o @@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile index 50f5f1b7206..b1366f0ba65 100644 --- a/src/backend/libpq/Makefile +++ b/src/backend/libpq/Makefile @@ -4,15 +4,13 @@ # Makefile for libpq subsystem (backend half of libpq interface) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.18 2000/05/28 17:55:56 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.19 2000/05/29 05:44:46 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. - # kerberos flags ifdef KRBVERS CFLAGS+= $(KRBFLAGS) diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index 6befeaf5413..77a69599f6e 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -4,15 +4,13 @@ # Makefile for main # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.7 1999/12/13 22:32:45 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.8 2000/05/29 05:44:47 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. - OBJS = main.o all: SUBSYS.o diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 42c86e3d725..ac239bcd6f9 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -4,14 +4,12 @@ # Makefile for nodes # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.10 1999/12/13 22:32:47 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.11 2000/05/29 05:44:47 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. -include ../../Makefile.global - -CFLAGS += -I.. +include $(SRCDIR)/Makefile.global OBJS = nodeFuncs.o nodes.o list.o \ copyfuncs.o equalfuncs.o freefuncs.o makefuncs.o outfuncs.o \ @@ -22,12 +20,7 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -outfuncs.o: ../parse.h - -../parse.h: - $(MAKE) -C .. parse.h - -depend dep: ../parse.h +depend dep: $(CC) -MM $(CFLAGS) *.c >depend clean: diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index db8458c37b9..7c461779259 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.116 2000/05/25 22:43:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.117 2000/05/29 05:44:47 tgl Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -36,11 +36,11 @@ #include "nodes/plannodes.h" #include "nodes/primnodes.h" #include "nodes/relation.h" +#include "parser/parse.h" #include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/syscache.h" -#include "../parse.h" static void _outDatum(StringInfo str, Datum value, Oid type); static void _outNode(StringInfo str, void *obj); diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 6ca017bd35d..f0e6ca4e513 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,15 +5,13 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Id: Makefile,v 1.13 1999/12/13 22:32:50 momjian Exp $ +# $Id: Makefile,v 1.14 2000/05/29 05:44:48 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - ifeq ($(CC), gcc) CFLAGS+= -Wno-error endif diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index fcca74f315b..2c4c906b8cc 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,15 +4,13 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.13 2000/02/07 04:40:59 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.14 2000/05/29 05:44:50 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = allpaths.o clausesel.o costsize.o indxpath.o \ joinpath.o joinrels.o orindxpath.o pathkeys.o tidpath.o diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index f0b394e6d67..5d0ef0fbfaf 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,15 +4,13 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.9 1999/12/13 22:32:54 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.10 2000/05/29 05:44:51 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o # not ready yet: predmig.o xfunc.o diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index f45708ebc52..313b3fa7ac3 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,15 +4,13 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.10 1999/12/13 22:32:55 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.11 2000/05/29 05:44:52 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o # not ready yet: predmig.o xfunc.o diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index 15dfc77fca2..dbed9f11acf 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,15 +4,13 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.11 1999/12/13 22:32:58 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.12 2000/05/29 05:44:53 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \ joininfo.o pathnode.o relnode.o tlist.o var.o diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 6f3a9310efe..1fdbd55a382 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -4,15 +4,13 @@ # Makefile for parser # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.24 2000/01/19 02:58:53 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.25 2000/05/29 05:44:53 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -CFLAGS += -I.. - ifeq ($(CC), gcc) CFLAGS+= -Wno-error endif diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 6f454063626..be40612a98c 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.c,v 1.143 2000/05/28 17:56:00 tgl Exp $ + * $Id: analyze.c,v 1.144 2000/05/29 05:44:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -18,8 +18,8 @@ #include "catalog/pg_index.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" -#include "parse.h" #include "parser/analyze.h" +#include "parser/parse.h" #include "parser/parse_agg.h" #include "parser/parse_clause.h" #include "parser/parse_relation.h" diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index f30abe49153..ffdcb9a61ce 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -8,17 +8,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.71 2000/04/12 17:15:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.72 2000/05/29 05:44:54 tgl Exp $ * *------------------------------------------------------------------------- */ #include <ctype.h> #include "postgres.h" + #include "nodes/parsenodes.h" #include "nodes/pg_list.h" -#include "parse.h" #include "parser/keywords.h" +#include "parser/parse.h" /* * List of (keyword-name, keyword-token-value) pairs. diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 7893b52f604..10671762901 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,17 +8,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.60 2000/05/12 01:33:54 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.61 2000/05/29 05:44:54 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" + #include "access/heapam.h" #include "miscadmin.h" #include "optimizer/tlist.h" -#include "parse.h" #include "nodes/makefuncs.h" +#include "parser/parse.h" #include "parser/parse_clause.h" #include "parser/parse_coerce.h" #include "parser/parse_expr.h" diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 0f16f25aff2..eb51f0696b2 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.77 2000/05/25 22:42:18 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.78 2000/05/29 05:44:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -20,9 +20,9 @@ #include "nodes/makefuncs.h" #include "nodes/params.h" #include "nodes/relation.h" -#include "parse.h" #include "parser/analyze.h" #include "parser/gramparse.h" +#include "parser/parse.h" #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_func.h" diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 2eb0934adec..6d904198209 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.69 2000/05/27 05:13:38 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.70 2000/05/29 05:44:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -25,9 +25,9 @@ #include "miscadmin.h" #include "nodes/parsenodes.h" #include "nodes/pg_list.h" -#include "parse.h" #include "parser/gramparse.h" #include "parser/keywords.h" +#include "parser/parse.h" #include "parser/scansup.h" #include "utils/builtins.h" diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index 190651cab20..17605c41dac 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -13,15 +13,13 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.22 2000/05/19 02:50:32 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.23 2000/05/29 05:44:54 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR=../.. include ../../Makefile.global -CFLAGS+= -I.. - OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@ OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@ diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile index 8e5f4ffd0d1..1399014dde8 100644 --- a/src/backend/port/nextstep/Makefile +++ b/src/backend/port/nextstep/Makefile @@ -8,10 +8,6 @@ SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) - OBJS = dynloader.o port.o all: SUBSYS.o @@ -20,7 +16,7 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/port/qnx4/Makefile b/src/backend/port/qnx4/Makefile index 82653290356..b367d9bbfbd 100644 --- a/src/backend/port/qnx4/Makefile +++ b/src/backend/port/qnx4/Makefile @@ -4,17 +4,13 @@ # Makefile for port/sparc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/Makefile,v 1.1 1999/12/16 16:52:52 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/Makefile,v 1.2 2000/05/29 05:44:56 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) - OBJS = isnan.o rint.o sem.o shm.o all: SUBSYS.o tstrint tstsem tstshm @@ -32,7 +28,7 @@ tstshm: tstshm.o shm.o $(CC) -o tstshm shm.o tstshm.o depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) tstrint tstrint.o tstsem tstsem.o tstshm tstshm.o diff --git a/src/backend/port/sunos4/Makefile b/src/backend/port/sunos4/Makefile index 671150009ce..c9583340228 100644 --- a/src/backend/port/sunos4/Makefile +++ b/src/backend/port/sunos4/Makefile @@ -4,17 +4,13 @@ # Makefile for port/sparc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.4 1999/12/13 22:33:15 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.5 2000/05/29 05:44:57 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) - OBJS = strtol.o all: SUBSYS.o @@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 3896245b995..ce8124e96a1 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,15 +4,13 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.10 1999/12/13 22:33:19 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.11 2000/05/29 05:44:58 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. - OBJS = postmaster.o all: SUBSYS.o diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 9beda9746e8..4d6935b7f1f 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,14 +4,13 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.12 2000/01/19 02:58:53 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.13 2000/05/29 05:44:58 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. CFLAGS += -DPOSIX_MISTAKE DEBUGOBJ = diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index a38cbb268e9..d47c7051017 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,15 +4,13 @@ # Makefile for rewrite # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.11 2000/01/19 02:58:54 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.12 2000/05/29 05:44:59 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -CFLAGS += -I.. - OBJS = rewriteRemove.o rewriteDefine.o \ rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index 20cf9f93bc3..5968a46bba2 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.13 1999/12/13 22:33:37 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.14 2000/05/29 05:45:00 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o all: SUBSYS.o diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index ca10b956790..d011d4a7a0c 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/file # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.8 1999/12/13 22:33:41 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.9 2000/05/29 05:45:03 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = fd.o buffile.o all: SUBSYS.o diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 1aeac4accce..7d9a662055d 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/ipc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.10 1999/12/13 22:33:45 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.11 2000/05/29 05:45:06 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - # seems to be required 1999/07/22 bjm ifeq ($(CPU),alpha) ifeq ($(CC), gcc) diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index d71a51a15af..fbf66847c2a 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.8 1999/12/13 22:33:49 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.9 2000/05/29 05:45:07 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = inv_api.o all: SUBSYS.o diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index 7d374e523f3..f284d39318a 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.12 2000/01/19 02:58:54 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.13 2000/05/29 05:45:08 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = lmgr.o lock.o proc.o all: SUBSYS.o diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 3395c62f3f7..14d1780c993 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.8 1999/12/13 22:33:59 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.9 2000/05/29 05:45:12 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = bufpage.o itemptr.o all: SUBSYS.o diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 3a3617698d1..f68443cd5df 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,15 +4,13 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.11 2000/01/19 02:58:55 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.12 2000/05/29 05:45:14 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = md.o mm.o smgr.o smgrtype.o all: SUBSYS.o diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index aaeda91f44f..5fafc75f691 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,14 +4,12 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.22 2000/05/28 17:56:04 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.23 2000/05/29 05:45:16 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. -include ../../Makefile.global - -CFLAGS+= -I.. +include $(SRCDIR)/Makefile.global ifeq ($(CC), gcc) CFLAGS+= -Wno-error @@ -24,17 +22,7 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -# The following dependencies are picked up by the make dep, but since -# not everyone can do make dep, and these are particularly important -# dependencies (because they don't even exist until you make them), -# they are hardcoded here. - -utility.o: ../parse.h - -../parse.h: - $(MAKE) -C .. parse.h - -dep depend: ../parse.h +depend dep: $(CC) -MM $(CFLAGS) *.c >depend clean: diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 683f057f212..f4f291bece3 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.155 2000/05/21 02:23:30 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.156 2000/05/29 05:45:16 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -48,6 +48,7 @@ #include "nodes/print.h" #include "optimizer/cost.h" #include "optimizer/planner.h" +#include "parser/parse.h" #include "parser/parser.h" #include "rewrite/rewriteHandler.h" #include "tcop/fastpath.h" @@ -58,9 +59,6 @@ #include "utils/ps_status.h" #include "utils/temprel.h" #include "utils/trace.h" - -#include "../backend/parser/parse.h" - #ifdef MULTIBYTE #include "mb/pg_wchar.h" #endif @@ -1452,7 +1450,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.155 $ $Date: 2000/05/21 02:23:30 $\n"); + puts("$Revision: 1.156 $ $Date: 2000/05/29 05:45:16 $\n"); } /* diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile index 7bfdd3064a3..041593f79ac 100644 --- a/src/backend/tioga/Makefile +++ b/src/backend/tioga/Makefile @@ -4,17 +4,13 @@ # Makefile for tioga # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.6 1999/12/13 22:34:22 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.7 2000/05/29 05:45:18 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) - OBJS = tgRecipe.o Varray.o all: SUBSYS.o @@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index eba9b13af29..deafee16d33 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -4,17 +4,13 @@ # Makefile for utils # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.11 2000/05/28 17:56:05 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.12 2000/05/29 05:45:18 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include $(SRCDIR)/Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) - all: submake SUBSYS.o OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \ diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 8ed27fe8933..298e15f0000 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/adt # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.36 2000/04/08 02:12:54 thomas Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.37 2000/05/29 05:45:20 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - # seems to be required for some date/time stuff 1999/07/22 bjm ifeq ($(CPU),alpha) ifeq ($(CC), gcc) diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index 7f595f68cb9..eaa4e764d5d 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.12 1999/12/13 22:34:38 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.13 2000/05/29 05:45:24 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o \ fcache.o temprel.o diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index 8893979cb38..2313f52aee2 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/error # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.7 1999/12/13 22:34:42 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.8 2000/05/29 05:45:27 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = assert.o elog.o exc.o excabort.o excid.o format.o all: SUBSYS.o diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index a269dcfee4f..f08c3fafdd7 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.8 1999/12/13 22:34:47 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.9 2000/05/29 05:45:30 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = dfmgr.o fmgr.o all: SUBSYS.o diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 24ca4822be0..282cd2527a5 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.7 1999/12/13 22:34:50 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.8 2000/05/29 05:45:30 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = dynahash.o hashfn.o all: SUBSYS.o diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index 656eadaf9f8..60ee275c641 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/init # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.12 2000/01/19 02:58:57 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.13 2000/05/29 05:45:32 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o all: SUBSYS.o diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile index 325e8835c08..456dd6c30c2 100644 --- a/src/backend/utils/mb/Makefile +++ b/src/backend/utils/mb/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/mb # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.7 2000/01/19 02:58:57 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.8 2000/05/29 05:45:34 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \ big5.o diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 626142d67c9..0afdb0a63bc 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/misc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.12 2000/01/19 02:58:58 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.13 2000/05/29 05:45:37 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = database.o superuser.o trace.o all: SUBSYS.o diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index 0fa41adff65..47698172228 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.7 1999/12/13 22:35:10 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.8 2000/05/29 05:45:40 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o all: SUBSYS.o diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index 2b29bddd372..f0e56ace0a8 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/sort # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.9 1999/12/13 22:35:14 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.10 2000/05/29 05:45:40 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = logtape.o tuplesort.o all: SUBSYS.o diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index 2f8bd354f60..d4ee33d5563 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,15 +4,13 @@ # Makefile for utils/time # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.7 1999/12/13 22:35:21 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.8 2000/05/29 05:45:42 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -CFLAGS += -I../.. - OBJS = tqual.o all: SUBSYS.o diff --git a/src/bin/pg_encoding/Makefile b/src/bin/pg_encoding/Makefile index ce4f4587767..5db546a9cf1 100644 --- a/src/bin/pg_encoding/Makefile +++ b/src/bin/pg_encoding/Makefile @@ -6,18 +6,14 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.6 2000/03/31 14:14:32 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.7 2000/05/29 05:45:44 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. -include ../../Makefile.global - -# This is a bit of hackery here: pg_encoding uses backend includes and the -# frontend library. +include $(SRCDIR)/Makefile.global OBJS= pg_encoding.o -CFLAGS:= -I$(SRCDIR)/include $(CFLAGS) all: submake pg_encoding diff --git a/src/bin/pg_version/Makefile.in b/src/bin/pg_version/Makefile.in index 64e0a2673a9..38d67a5e1c5 100644 --- a/src/bin/pg_version/Makefile.in +++ b/src/bin/pg_version/Makefile.in @@ -7,15 +7,13 @@ # Portions Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.8 2000/05/11 17:46:35 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.9 2000/05/29 05:45:46 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include $(SRCDIR)/Makefile.global -CFLAGS+= -I$(SRCDIR)/include - OBJS= pg_version.o $(SRCDIR)/utils/version.o @STRERROR2@ all: pg_version diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index fa766ff5f0b..f516a360a9b 100644 --- a/src/interfaces/libpgtcl/Makefile.in +++ b/src/interfaces/libpgtcl/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.39 2000/03/08 01:58:36 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.40 2000/05/29 05:45:48 tgl Exp $ # #------------------------------------------------------------------------- @@ -17,9 +17,7 @@ SO_MINOR_VERSION= 1 SRCDIR= @top_srcdir@ include $(SRCDIR)/Makefile.global -CFLAGS+= -I$(SRCDIR)/backend \ - -I$(SRCDIR)/include \ - -I$(LIBPQDIR) +CFLAGS+= -I$(LIBPQDIR) ifdef KRBVERS CFLAGS+= $(KRBFLAGS) diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in index dad0c4813ef..8c217d9df7e 100644 --- a/src/interfaces/libpq++/Makefile.in +++ b/src/interfaces/libpq++/Makefile.in @@ -6,7 +6,7 @@ # Copyright (c) 1994, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.24 2000/04/22 22:39:15 tgl Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.25 2000/05/29 05:45:50 tgl Exp $ # #------------------------------------------------------------------------- @@ -23,9 +23,7 @@ CXXFLAGS=@CXXFLAGS@ SRCHEADERDIR = $(SRCDIR)/include LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq -CXXFLAGS+= -I$(SRCDIR)/backend \ - -I$(SRCHEADERDIR) \ - -I$(LIBPQDIR) +CXXFLAGS+= -I$(SRCHEADERDIR) -I$(LIBPQDIR) ifdef KRBVERS CXXFLAGS+= $(KRBFLAGS) diff --git a/src/interfaces/libpq++/examples/Makefile b/src/interfaces/libpq++/examples/Makefile index 5e277ade323..b30588e4c91 100644 --- a/src/interfaces/libpq++/examples/Makefile +++ b/src/interfaces/libpq++/examples/Makefile @@ -15,9 +15,7 @@ LIBPQDIR= /usr/local/pgsql/lib #CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic CXXFLAGS= $(CFLAGS) -INCLUDE_OPT= -I$(HEADERDIR) - -CXXFLAGS+= $(INCLUDE_OPT) +CXXFLAGS+= -I$(HEADERDIR) LDFLAGS+= -L$(LIBPQDIR) -lpq++ diff --git a/src/pl/plperl/Makefile.PL b/src/pl/plperl/Makefile.PL index 565e8bbd288..a5b6066b084 100644 --- a/src/pl/plperl/Makefile.PL +++ b/src/pl/plperl/Makefile.PL @@ -54,7 +54,7 @@ my $perllib = "-L$Config{archlibexp}/CORE -lperl"; WriteMakefile( 'NAME' => 'plperl', dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } , - INC => '-I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)', + INC => '-I$(SRCDIR)/include $(PGSQL_INCLUDES)', XS => { 'SPI.xs' => 'SPI.c' }, OBJECT => 'plperl.o eloglvl.o SPI.o', ); diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in index 63a1af65960..cd465c0cf67 100644 --- a/src/pl/plpgsql/src/Makefile.in +++ b/src/pl/plpgsql/src/Makefile.in @@ -4,7 +4,7 @@ # Makefile for the plpgsql shared object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.22 2000/04/04 01:47:59 tgl Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.23 2000/05/29 05:45:53 tgl Exp $ # #------------------------------------------------------------------------- @@ -15,8 +15,6 @@ SO_MINOR_VERSION= 0 SRCDIR= @top_srcdir@ include $(SRCDIR)/Makefile.global -CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend - # If using flex, ask for a case-insensitive, lex-compatible lexer. ifneq (,$(findstring flex,$(LEX))) LFLAGS+= -i -l diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 8400d364f36..b664d8a7918 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -4,7 +4,7 @@ # Makefile for the pltcl shared object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.14 2000/05/23 02:12:44 tgl Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.15 2000/05/29 05:45:54 tgl Exp $ # #------------------------------------------------------------------------- @@ -70,7 +70,7 @@ CFLAGS= $(TCL_CFLAGS_OPTIMIZE) CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS) -CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES) +CFLAGS+= -I$(SRCDIR)/include $(PGSQL_INCLUDES) # # Uncomment the following to enable the unknown command lookup diff --git a/src/test/regress/GNUmakefile.in b/src/test/regress/GNUmakefile.in index cdb95c1fb6e..88b207ebcef 100644 --- a/src/test/regress/GNUmakefile.in +++ b/src/test/regress/GNUmakefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/Attic/GNUmakefile.in,v 1.1 2000/01/09 07:53:58 tgl Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/GNUmakefile.in,v 1.2 2000/05/29 05:45:55 tgl Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ CONTRIB= $(SRCDIR)/../contrib HOST= @host@ -CFLAGS+= -I$(LIBPQDIR) -I$(SRCDIR)/include $(CFLAGS_SL) +CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL) LDADD+= -L$(LIBPQDIR) -lpq diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile index 9ba5096f0a1..f3fd6b24bac 100644 --- a/src/tutorial/Makefile +++ b/src/tutorial/Makefile @@ -4,14 +4,14 @@ # Makefile for tutorial # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.9 2000/03/28 02:49:19 tgl Exp $ +# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.10 2000/05/29 05:45:56 tgl Exp $ # #------------------------------------------------------------------------- SRCDIR= .. include $(SRCDIR)/Makefile.global -CFLAGS+= -I$(SRCDIR)/include $(CFLAGS_SL) +CFLAGS+= $(CFLAGS_SL) # # DLOBJS is the dynamically-loaded object files. The "funcs" queries |