Commit 091126fa authored by Tom Lane's avatar Tom Lane

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.
parent 18952f67
...@@ -11,42 +11,18 @@ ...@@ -11,42 +11,18 @@
# The following subdirs give make errors: # The following subdirs give make errors:
# #
# earthdistance # earthdistance
# findoidjoins
# isbn_issn
# os2client # os2client
# pginterface
all: all:
for dir in *; do \
if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir; \
fi; \
done
install:
for dir in *; do \ for dir in *; do \
if [ -e $$dir/Makefile ]; then \ if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir $@ ; \ $(MAKE) -C $$dir $@ ; \
fi; \ fi; \
done done
install-doc: .DEFAULT:
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:
for dir in *; do \ for dir in *; do \
if [ -e $$dir/Makefile ]; then \ if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir $@ ; \ $(MAKE) -C $$dir $@ ; \
fi; \ fi; \
done || exit 0 done
...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src ...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I./ \ CFLAGS += -I. $(CFLAGS_SL)
-I$(SRCDIR)/ \
-I$(SRCDIR)/include \
-I$(SRCDIR)/port/$(PORTNAME)
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
MODNAME = array_iterator MODNAME = array_iterator
...@@ -61,7 +56,7 @@ $(SQLDIR): ...@@ -61,7 +56,7 @@ $(SQLDIR):
$(CC) $(CFLAGS) -shared -o $@ $< $(CC) $(CFLAGS) -shared -o $@ $<
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f *~ $(MODULE) $(MODNAME).sql rm -f *~ $(MODULE) $(MODNAME).sql
......
...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src ...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I./ \ CFLAGS += -I. $(CFLAGS_SL)
-I$(SRCDIR)/ \
-I$(SRCDIR)/include \
-I$(SRCDIR)/port/$(PORTNAME)
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
MODNAME = datetime_functions MODNAME = datetime_functions
...@@ -61,7 +56,7 @@ $(SQLDIR): ...@@ -61,7 +56,7 @@ $(SQLDIR):
$(CC) $(CFLAGS) -shared -o $@ $< $(CC) $(CFLAGS) -shared -o $@ $<
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f *~ $(MODULE) $(MODNAME).sql rm -f *~ $(MODULE) $(MODNAME).sql
......
...@@ -96,7 +96,7 @@ hhmm_in(char *str) ...@@ -96,7 +96,7 @@ hhmm_in(char *str)
*tm = &tt; *tm = &tt;
if (!PointerIsValid(str)) 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) if (decode_24h_time(str, tm, &fsec) != 0)
elog(ERROR, "Bad time external representation '%s'", str); elog(ERROR, "Bad time external representation '%s'", str);
......
...@@ -15,6 +15,7 @@ int4 date_month(DateADT val); ...@@ -15,6 +15,7 @@ int4 date_month(DateADT val);
int4 date_year(DateADT val); int4 date_year(DateADT val);
TimeADT *currenttime(void); TimeADT *currenttime(void);
DateADT currentdate(void); DateADT currentdate(void);
int4 date2mjd(DateADT val);
#endif #endif
......
...@@ -4,7 +4,7 @@ include $(SRCDIR)/Makefile.global ...@@ -4,7 +4,7 @@ include $(SRCDIR)/Makefile.global
CONTRIBDIR=$(LIBDIR)/contrib CONTRIBDIR=$(LIBDIR)/contrib
CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include CFLAGS+= $(CFLAGS_SL)
TARGETS= fti$(DLSUFFIX) TARGETS= fti$(DLSUFFIX)
CLEANFILES+= $(TARGETS) CLEANFILES+= $(TARGETS)
......
# #
# PostgreSQL types for ISBN and ISSN identifiers. # 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 include $(SRCDIR)/Makefile.global
ld -Bshareable -o isbn.so isbn.o
isbn.o: isbn.c CFLAGS+= $(CFLAGS_SL)
cc -g -O -fPIC -I/usr/local/pgsql/include -c isbn.c
issn.so: issn.o all: isbn$(DLSUFFIX) issn$(DLSUFFIX)
ld -Bshareable -o issn.so issn.o
issn.o: issn.c install: isbn$(DLSUFFIX) issn$(DLSUFFIX)
cc -g -O -fPIC -I/usr/local/pgsql/include -c issn.c install -c isbn$(DLSUFFIX) issn$(DLSUFFIX) /usr/local/pgsql/modules
install: isbn.so issn.so clean:
install -c isbn.so issn.so /usr/local/pgsql/modules rm -f isbn$(DLSUFFIX) issn$(DLSUFFIX) *.o
#
# eof
#
/* /*
* PostgreSQL type definitions for ISBNs. * 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> #include <stdio.h>
...@@ -47,8 +47,6 @@ isbn * ...@@ -47,8 +47,6 @@ isbn *
isbn_in(char *str) isbn_in(char *str)
{ {
isbn *result; isbn *result;
char *cp;
int count;
if (strlen(str) != 13) if (strlen(str) != 13)
{ {
......
/* /*
* PostgreSQL type definitions for ISSNs. * 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> #include <stdio.h>
...@@ -47,8 +47,6 @@ issn * ...@@ -47,8 +47,6 @@ issn *
issn_in(char *str) issn_in(char *str)
{ {
issn *result; issn *result;
char *cp;
int count;
if (strlen(str) != 9) if (strlen(str) != 9)
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Makefile pinched from the ip-mac contrib package # 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 SRCDIR= ../../src
...@@ -11,7 +11,7 @@ include $(SRCDIR)/Makefile.global ...@@ -11,7 +11,7 @@ include $(SRCDIR)/Makefile.global
CONTRIBDIR=$(LIBDIR)/modules CONTRIBDIR=$(LIBDIR)/modules
CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include CFLAGS+= $(CFLAGS_SL)
ifdef REFINT_VERBOSE ifdef REFINT_VERBOSE
CFLAGS+= -DREFINT_VERBOSE CFLAGS+= -DREFINT_VERBOSE
......
...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src ...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I./ \ CFLAGS += -I. $(CFLAGS_SL)
-I$(SRCDIR)/ \
-I$(SRCDIR)/include \
-I$(SRCDIR)/port/$(PORTNAME)
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
MODNAME = misc_utils MODNAME = misc_utils
...@@ -61,7 +56,7 @@ $(SQLDIR): ...@@ -61,7 +56,7 @@ $(SQLDIR):
$(CC) $(CFLAGS) -shared -o $@ $< $(CC) $(CFLAGS) -shared -o $@ $<
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f *~ $(MODULE) $(MODNAME).sql rm -f *~ $(MODULE) $(MODNAME).sql
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <errno.h> #include <errno.h>
#include "postgres.h" #include "postgres.h"
#include "access/heapam.h" #include "access/heapam.h"
#include "access/htup.h" #include "access/htup.h"
#include "access/relscan.h" #include "access/relscan.h"
...@@ -22,14 +23,16 @@ ...@@ -22,14 +23,16 @@
#include "access/tupdesc.h" #include "access/tupdesc.h"
#include "catalog/catname.h" #include "catalog/catname.h"
#include "catalog/pg_listener.h" #include "catalog/pg_listener.h"
#include "fmgr.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "utils/fmgr.h" #include "utils/fmgroids.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "utils/tqual.h" #include "utils/tqual.h"
#include "misc_utils.h" #include "misc_utils.h"
#undef MIN
#define MIN(x,y) ((x)<=(y) ? (x) : (y)) #define MIN(x,y) ((x)<=(y) ? (x) : (y))
extern int ExecutorLimit(int limit); extern int ExecutorLimit(int limit);
......
...@@ -9,7 +9,7 @@ ifndef PGLIB ...@@ -9,7 +9,7 @@ ifndef PGLIB
PGLIB= . PGLIB= .
endif endif
CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include CFLAGS+= $(CFLAGS_SL)
TARGETS_7= odbc.sql TARGETS_7= odbc.sql
TARGETS_PRE7= odbc$(DLSUFFIX) odbc-pre7.sql TARGETS_PRE7= odbc$(DLSUFFIX) odbc-pre7.sql
......
/* /*
* $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 * pgbench: a simple TPC-B like benchmark program for PostgreSQL
* written by Tatsuo Ishii * written by Tatsuo Ishii
...@@ -591,7 +591,7 @@ main(int argc, char **argv) ...@@ -591,7 +591,7 @@ main(int argc, char **argv)
} }
if (rlim.rlim_cur <= (nclients + 2)) 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"); fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
exit(1); exit(1);
} }
......
...@@ -10,25 +10,7 @@ SRCDIR = $(PGDIR)/src ...@@ -10,25 +10,7 @@ SRCDIR = $(PGDIR)/src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I ./ \ CFLAGS += -I. $(CFLAGS_SL)
-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
MODNAME = soundex MODNAME = soundex
...@@ -53,7 +35,7 @@ install: $(MODULE) ...@@ -53,7 +35,7 @@ install: $(MODULE)
$(CC) $(CFLAGS) -shared -o $@ $< $(CC) $(CFLAGS) -shared -o $@ $<
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f $(MODULE) $(MODNAME).sql rm -f $(MODULE) $(MODNAME).sql
......
...@@ -2,23 +2,21 @@ ...@@ -2,23 +2,21 @@
/* soundex.c */ /* soundex.c */
/*****************************************************************************/ /*****************************************************************************/
#include <ctype.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "postgres.h" /* for char16, etc. */ #include "postgres.h" /* for char16, etc. */
#include "utils/palloc.h" /* for palloc */ #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); char *soundex(char *instr, char *outstr);
text * text *
text_soundex(text *t) text_soundex(text *t)
{ {
/* ABCDEFGHIJKLMNOPQRSTUVWXYZ */
char *table = "01230120022455012623010202";
int count = 0;
text *new_t; text *new_t;
char outstr[6 + 1]; /* max length of soundex is 6 */ char outstr[6 + 1]; /* max length of soundex is 6 */
...@@ -49,7 +47,8 @@ text_soundex(text *t) ...@@ -49,7 +47,8 @@ text_soundex(text *t)
char * char *
soundex(char *instr, char *outstr) soundex(char *instr, char *outstr)
{ /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ {
/* ABCDEFGHIJKLMNOPQRSTUVWXYZ */
char *table = "01230120022455012623010202"; char *table = "01230120022455012623010202";
int count = 0; int count = 0;
......
...@@ -3,7 +3,7 @@ SRCDIR= ../../src ...@@ -3,7 +3,7 @@ SRCDIR= ../../src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include CFLAGS+= $(CFLAGS_SL)
ifdef REFINT_VERBOSE ifdef REFINT_VERBOSE
CFLAGS+= -DREFINT_VERBOSE CFLAGS+= -DREFINT_VERBOSE
......
...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src ...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I./ \ CFLAGS += -I. $(CFLAGS_SL)
-I$(SRCDIR)/ \
-I$(SRCDIR)/include \
-I$(SRCDIR)/port/$(PORTNAME)
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
MODNAME = string_io MODNAME = string_io
...@@ -61,7 +56,7 @@ $(SQLDIR): ...@@ -61,7 +56,7 @@ $(SQLDIR):
$(CC) $(CFLAGS) -shared -o $@ $< $(CC) $(CFLAGS) -shared -o $@ $<
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f *~ $(MODULE) $(MODNAME).sql rm -f *~ $(MODULE) $(MODNAME).sql
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
/* define this if you want to see iso-8859 characters */ /* define this if you want to see iso-8859 characters */
#define ISO8859 #define ISO8859
#undef MIN
#define MIN(x, y) ((x) < (y) ? (x) : (y)) #define MIN(x, y) ((x) < (y) ? (x) : (y))
#define VALUE(char) ((char) - '0') #define VALUE(char) ((char) - '0')
#define DIGIT(val) ((val) + '0') #define DIGIT(val) ((val) + '0')
......
...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src ...@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I./ \ CFLAGS += -I. $(CFLAGS_SL)
-I$(SRCDIR)/ \
-I$(SRCDIR)/include \
-I$(SRCDIR)/port/$(PORTNAME)
CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
MODNAME = user_locks MODNAME = user_locks
...@@ -61,7 +56,7 @@ $(SQLDIR): ...@@ -61,7 +56,7 @@ $(SQLDIR):
$(CC) $(CFLAGS) -shared -o $@ $< $(CC) $(CFLAGS) -shared -o $@ $<
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f *~ $(MODULE) $(MODNAME).sql rm -f *~ $(MODULE) $(MODNAME).sql
......
# $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 SRCDIR= ../../src
...@@ -6,7 +6,7 @@ include $(SRCDIR)/Makefile.global ...@@ -6,7 +6,7 @@ include $(SRCDIR)/Makefile.global
CONTRIBDIR=$(LIBDIR)/contrib CONTRIBDIR=$(LIBDIR)/contrib
CFLAGS+= -I$(HEADERDIR) CFLAGS+= -I$(LIBPQDIR)
TARGETS= vacuumlo TARGETS= vacuumlo
CLEANFILES+= $(TARGETS) CLEANFILES+= $(TARGETS)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
...@@ -208,7 +208,7 @@ YFLAGS= @YFLAGS@ ...@@ -208,7 +208,7 @@ YFLAGS= @YFLAGS@
YACC= @YACC@ YACC= @YACC@
LEX= @LEX@ LEX= @LEX@
AROPT= @AROPT@ AROPT= @AROPT@
CFLAGS= -I$(SRCDIR)/include -I$(SRCDIR)/backend @CPPFLAGS@ @CFLAGS@ CFLAGS= -I$(SRCDIR)/include @CPPFLAGS@ @CFLAGS@
CFLAGS_SL= @SHARED_LIB@ CFLAGS_SL= @SHARED_LIB@
PGSQL_INCLUDES= @PGSQL_INCLUDES@ PGSQL_INCLUDES= @PGSQL_INCLUDES@
LIBS= @LIBS@ LIBS= @LIBS@
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
# #
# We don't use $(LD) for linking. We use $(CC) instead. This is because # 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 # 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. # it that the more primitive $(LD) doesn't have.
# #
# #
# IDENTIFICATION # 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 ...@@ -50,9 +50,11 @@ DIRS += tioga
endif endif
OBJS = $(DIRS:%=%/SUBSYS.o) OBJS = $(DIRS:%=%/SUBSYS.o)
ifeq ($(PORTNAME), qnx4) ifeq ($(PORTNAME), qnx4)
# This file chrashes wlink and is therefore not in bootstrap/SUBSYS.o. # This file crashes qnx4's wlink and is therefore not in bootstrap/SUBSYS.o
OBJS1 = bootstrap/bootstrap.o # on that platform. (Wotta hack ... is it still necessary?)
OBJS+= bootstrap/bootstrap.o
endif endif
VERSIONOBJ = $(SRCDIR)/utils/version.o VERSIONOBJ = $(SRCDIR)/utils/version.o
...@@ -75,22 +77,25 @@ libpostgres.a: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def ...@@ -75,22 +77,25 @@ libpostgres.a: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def
$(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@
endif endif
all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \ all: prebuildheaders postgres $(POSTGRES_IMP) \
global1.description local1_template1.description global1.bki.source local1_template1.bki.source \
global1.description local1_template1.description
ifneq ($(PORTNAME), win) 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 else
postgres: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def libpostgres.a postgres: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def libpostgres.a
dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def
gcc -g -o $@$(X) -Wl,--base-file,$@.base $@.exp $(DLLOBJS) $(DLLLIBS) gcc -g -o $@$(X) -Wl,--base-file,$@.base $@.exp $(DLLOBJS) $(DLLLIBS)
dlltool --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def dlltool --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def
gcc -g -o $@$(X) $@.exp $(DLLOBJS) $(DLLLIBS) gcc -g -o $@$(X) $@.exp $(DLLOBJS) $(DLLLIBS)
rm $@.exp $@.base rm $@.exp $@.base
endif
#.PHONY: postgres endif
$(OBJS): $(DIRS:%=%.dir) $(OBJS): $(DIRS:%=%.dir)
...@@ -114,24 +119,36 @@ catalog/global1.description catalog/local1_template1.description: ...@@ -114,24 +119,36 @@ catalog/global1.description catalog/local1_template1.description:
# The postgres.o target is needed by the rule in Makefile.global that # The postgres.o target is needed by the rule in Makefile.global that
# creates the exports file when MAKE_EXPORTS = true. # creates the exports file when MAKE_EXPORTS = true.
postgres.o: $(OBJS) 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 # 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 $(SRCDIR)/include/parser/parse.h: parser/parse.h
cp parser/parse.h . cp parser/parse.h $(SRCDIR)/include/parser
parser/parse.h: parser/parse.h: parser/gram.y
$(MAKE) -C parser parse.h $(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 $(MAKE) -C utils fmgroids.h
############################################################################# #############################################################################
clean: 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.bki.source local1_template1.bki.source \
global1.description local1_template1.description global1.description local1_template1.description
ifeq ($(PORTNAME), win) ifeq ($(PORTNAME), win)
...@@ -141,6 +158,9 @@ endif ...@@ -141,6 +158,9 @@ endif
endif endif
for i in $(DIRS); do $(MAKE) -C $$i clean; done for i in $(DIRS); do $(MAKE) -C $$i clean; done
depend dep: prebuildheaders
for i in $(DIRS); do $(MAKE) -C $$i $@; done
.DEFAULT: .DEFAULT:
for i in $(DIRS); do $(MAKE) -C $$i $@; done for i in $(DIRS); do $(MAKE) -C $$i $@; done
...@@ -202,7 +222,7 @@ install-templates: $(TEMPLATEDIR) \ ...@@ -202,7 +222,7 @@ install-templates: $(TEMPLATEDIR) \
$(INSTALL) $(INSTLOPTS) pg_options.sample \ $(INSTALL) $(INSTLOPTS) pg_options.sample \
$(TEMPLATEDIR)/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) ]; then mkdir $(HEADERDIR); fi
-@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi -@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
-@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \ -@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
...@@ -239,7 +259,7 @@ install-headers: utils/fmgroids.h $(SRCDIR)/include/config.h ...@@ -239,7 +259,7 @@ install-headers: utils/fmgroids.h $(SRCDIR)/include/config.h
$(HEADERDIR)/utils/geo_decls.h $(HEADERDIR)/utils/geo_decls.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \ $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
$(HEADERDIR)/utils/elog.h $(HEADERDIR)/utils/elog.h
$(INSTALL) $(INSTLOPTS) utils/fmgroids.h \ $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/fmgroids.h \
$(HEADERDIR)/utils/fmgroids.h $(HEADERDIR)/utils/fmgroids.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \ $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
$(HEADERDIR)/utils/palloc.h $(HEADERDIR)/utils/palloc.h
...@@ -284,7 +304,7 @@ endif ...@@ -284,7 +304,7 @@ endif
# are up to date. It saves the time of doing all the submakes. # are up to date. It saves the time of doing all the submakes.
.PHONY: quick .PHONY: quick
quick: $(OBJS) 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 # Build the file, "./ID", used by the "gid" (grep-for-identifier) tool
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/common # Makefile for access/common
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS+=-I../..
OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \ OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \
scankey.o tupdesc.o scankey.o tupdesc.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/gist # Makefile for access/gist
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = gist.o gistget.o gistscan.o giststrat.o OBJS = gist.o gistget.o gistscan.o giststrat.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/hash # Makefile for access/hash
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \ OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \
hashsearch.o hashstrat.o hashutil.o hashsearch.o hashstrat.o hashutil.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/heap # Makefile for access/heap
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = heapam.o hio.o stats.o tuptoaster.o OBJS = heapam.o hio.o stats.o tuptoaster.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/index # Makefile for access/index
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = genam.o indexam.o istrat.o OBJS = genam.o indexam.o istrat.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/nbtree # Makefile for access/nbtree
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \ OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \
nbtstrat.o nbtutils.o nbtsort.o nbtstrat.o nbtutils.o nbtsort.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/rtree # Makefile for access/rtree
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for access/transam # Makefile for access/transam
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for the bootstrap module # Makefile for the bootstrap module
# #
# IDENTIFICATION # 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, # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR= ../.. SRCDIR= ../..
include ../../Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS += -I..
ifeq ($(CC), gcc) ifeq ($(CC), gcc)
CFLAGS+= -Wno-error CFLAGS+= -Wno-error
...@@ -29,20 +27,18 @@ endif ...@@ -29,20 +27,18 @@ endif
BOOTYACCS= bootstrap_tokens.h bootparse.c BOOTYACCS= bootstrap_tokens.h bootparse.c
ifneq ($(PORTNAME), qnx4)
OBJS= bootparse.o bootscanner.o bootstrap.o OBJS= bootparse.o bootscanner.o bootstrap.o
ifeq ($(PORTNAME), qnx4) else
# wlink currently crashes with bootstrap.o # qnx4's wlink currently crashes with bootstrap.o
OBJS1= bootparse.o bootscanner.o OBJS= bootparse.o bootscanner.o
endif endif
all: SUBSYS.o # make sure bootstrap.o is built even on qnx4
all: SUBSYS.o bootstrap.o
SUBSYS.o: $(OBJS) SUBSYS.o: $(OBJS)
ifneq ($(PORTNAME), qnx4)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(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 # bootstrap.o's dependency on bootstrap_tokens.h is computed by the
# make depend, but we state it here explicitly anyway because # make depend, but we state it here explicitly anyway because
...@@ -65,7 +61,7 @@ bootscanner.c: bootscanner.l ...@@ -65,7 +61,7 @@ bootscanner.c: bootscanner.l
rm -f lex.yy.c sedfile rm -f lex.yy.c sedfile
clean: 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: # 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 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 ...@@ -77,4 +73,3 @@ dep depend: bootparse.c bootscanner.c bootstrap_tokens.h
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for catalog # Makefile for catalog
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
OBJS = catalog.o heap.o index.o indexing.o aclchk.o \ OBJS = catalog.o heap.o index.o indexing.o aclchk.o \
pg_aggregate.o pg_operator.o pg_proc.o pg_type.o pg_aggregate.o pg_operator.o pg_proc.o pg_type.o
......
...@@ -4,14 +4,12 @@ ...@@ -4,14 +4,12 @@
# Makefile for commands # Makefile for commands
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS += -I..
OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \ 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 \ remove.o rename.o vacuum.o view.o cluster.o \
...@@ -23,15 +21,6 @@ all: SUBSYS.o ...@@ -23,15 +21,6 @@ all: SUBSYS.o
SUBSYS.o: $(OBJS) SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) 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: depend dep:
$(CC) -MM $(CFLAGS) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated * The PortalExecutorHeapMemory crap needs to be eliminated
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "commands/comment.h" #include "commands/comment.h"
#include "access/genam.h" #include "access/genam.h"
#include "optimizer/clauses.h" #include "optimizer/clauses.h"
#include "../parser/parse.h" #include "parser/parse.h"
#endif /* _DROP_COLUMN_HACK__ */ #endif /* _DROP_COLUMN_HACK__ */
/* ---------------- /* ----------------
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for executor # Makefile for executor
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \ OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
execProcnode.o execQual.o execScan.o execTuples.o \ execProcnode.o execQual.o execScan.o execTuples.o \
execUtils.o functions.o nodeAppend.o nodeAgg.o nodeHash.o \ execUtils.o functions.o nodeAppend.o nodeAgg.o nodeHash.o \
......
...@@ -4,17 +4,13 @@ ...@@ -4,17 +4,13 @@
# Makefile for lib (miscellaneous stuff) # Makefile for lib (miscellaneous stuff)
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I..
CFLAGS+=$(INCLUDE_OPT)
OBJS = bit.o fstack.o hasht.o lispsort.o stringinfo.o dllist.o OBJS = bit.o fstack.o hasht.o lispsort.o stringinfo.o dllist.o
all: SUBSYS.o all: SUBSYS.o
...@@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS) ...@@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f SUBSYS.o $(OBJS) rm -f SUBSYS.o $(OBJS)
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for libpq subsystem (backend half of libpq interface) # Makefile for libpq subsystem (backend half of libpq interface)
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
# kerberos flags # kerberos flags
ifdef KRBVERS ifdef KRBVERS
CFLAGS+= $(KRBFLAGS) CFLAGS+= $(KRBFLAGS)
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for main # Makefile for main
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
OBJS = main.o OBJS = main.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,14 +4,12 @@ ...@@ -4,14 +4,12 @@
# Makefile for nodes # Makefile for nodes
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS += -I..
OBJS = nodeFuncs.o nodes.o list.o \ OBJS = nodeFuncs.o nodes.o list.o \
copyfuncs.o equalfuncs.o freefuncs.o makefuncs.o outfuncs.o \ copyfuncs.o equalfuncs.o freefuncs.o makefuncs.o outfuncs.o \
...@@ -22,12 +20,7 @@ all: SUBSYS.o ...@@ -22,12 +20,7 @@ all: SUBSYS.o
SUBSYS.o: $(OBJS) SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
outfuncs.o: ../parse.h depend dep:
../parse.h:
$(MAKE) -C .. parse.h
depend dep: ../parse.h
$(CC) -MM $(CFLAGS) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * 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 * NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which * Every (plan) node in POSTGRES has an associated "out" routine which
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
#include "nodes/plannodes.h" #include "nodes/plannodes.h"
#include "nodes/primnodes.h" #include "nodes/primnodes.h"
#include "nodes/relation.h" #include "nodes/relation.h"
#include "parser/parse.h"
#include "utils/datum.h" #include "utils/datum.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#include "../parse.h"
static void _outDatum(StringInfo str, Datum value, Oid type); static void _outDatum(StringInfo str, Datum value, Oid type);
static void _outNode(StringInfo str, void *obj); static void _outNode(StringInfo str, void *obj);
......
...@@ -5,15 +5,13 @@ ...@@ -5,15 +5,13 @@
# #
# Copyright (c) 1994, Regents of the University of California # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
ifeq ($(CC), gcc) ifeq ($(CC), gcc)
CFLAGS+= -Wno-error CFLAGS+= -Wno-error
endif endif
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for optimizer/path # Makefile for optimizer/path
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = allpaths.o clausesel.o costsize.o indxpath.o \ OBJS = allpaths.o clausesel.o costsize.o indxpath.o \
joinpath.o joinrels.o orindxpath.o pathkeys.o tidpath.o joinpath.o joinrels.o orindxpath.o pathkeys.o tidpath.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for optimizer/plan # Makefile for optimizer/plan
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o
# not ready yet: predmig.o xfunc.o # not ready yet: predmig.o xfunc.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for optimizer/prep # Makefile for optimizer/prep
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o
# not ready yet: predmig.o xfunc.o # not ready yet: predmig.o xfunc.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for optimizer/util # Makefile for optimizer/util
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \ OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \
joininfo.o pathnode.o relnode.o tlist.o var.o joininfo.o pathnode.o relnode.o tlist.o var.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for parser # Makefile for parser
# #
# IDENTIFICATION # 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= ../.. SRCDIR= ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
ifeq ($(CC), gcc) ifeq ($(CC), gcc)
CFLAGS+= -Wno-error CFLAGS+= -Wno-error
endif endif
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * 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 @@ ...@@ -18,8 +18,8 @@
#include "catalog/pg_index.h" #include "catalog/pg_index.h"
#include "catalog/pg_type.h" #include "catalog/pg_type.h"
#include "nodes/makefuncs.h" #include "nodes/makefuncs.h"
#include "parse.h"
#include "parser/analyze.h" #include "parser/analyze.h"
#include "parser/parse.h"
#include "parser/parse_agg.h" #include "parser/parse_agg.h"
#include "parser/parse_clause.h" #include "parser/parse_clause.h"
#include "parser/parse_relation.h" #include "parser/parse_relation.h"
......
...@@ -8,17 +8,18 @@ ...@@ -8,17 +8,18 @@
* *
* *
* IDENTIFICATION * 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 <ctype.h>
#include "postgres.h" #include "postgres.h"
#include "nodes/parsenodes.h" #include "nodes/parsenodes.h"
#include "nodes/pg_list.h" #include "nodes/pg_list.h"
#include "parse.h"
#include "parser/keywords.h" #include "parser/keywords.h"
#include "parser/parse.h"
/* /*
* List of (keyword-name, keyword-token-value) pairs. * List of (keyword-name, keyword-token-value) pairs.
......
...@@ -8,17 +8,18 @@ ...@@ -8,17 +8,18 @@
* *
* *
* IDENTIFICATION * 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 "postgres.h"
#include "access/heapam.h" #include "access/heapam.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "optimizer/tlist.h" #include "optimizer/tlist.h"
#include "parse.h"
#include "nodes/makefuncs.h" #include "nodes/makefuncs.h"
#include "parser/parse.h"
#include "parser/parse_clause.h" #include "parser/parse_clause.h"
#include "parser/parse_coerce.h" #include "parser/parse_coerce.h"
#include "parser/parse_expr.h" #include "parser/parse_expr.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 @@ ...@@ -20,9 +20,9 @@
#include "nodes/makefuncs.h" #include "nodes/makefuncs.h"
#include "nodes/params.h" #include "nodes/params.h"
#include "nodes/relation.h" #include "nodes/relation.h"
#include "parse.h"
#include "parser/analyze.h" #include "parser/analyze.h"
#include "parser/gramparse.h" #include "parser/gramparse.h"
#include "parser/parse.h"
#include "parser/parse_coerce.h" #include "parser/parse_coerce.h"
#include "parser/parse_expr.h" #include "parser/parse_expr.h"
#include "parser/parse_func.h" #include "parser/parse_func.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * 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 @@ ...@@ -25,9 +25,9 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "nodes/parsenodes.h" #include "nodes/parsenodes.h"
#include "nodes/pg_list.h" #include "nodes/pg_list.h"
#include "parse.h"
#include "parser/gramparse.h" #include "parser/gramparse.h"
#include "parser/keywords.h" #include "parser/keywords.h"
#include "parser/parse.h"
#include "parser/scansup.h" #include "parser/scansup.h"
#include "utils/builtins.h" #include "utils/builtins.h"
......
...@@ -13,15 +13,13 @@ ...@@ -13,15 +13,13 @@
# be converted to Method 2. # be converted to Method 2.
# #
# IDENTIFICATION # 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=../.. SRCDIR=../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS+= -I..
OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@ OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@
OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@
OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@ OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@
......
...@@ -8,10 +8,6 @@ ...@@ -8,10 +8,6 @@
SRCDIR = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../..
CFLAGS+=$(INCLUDE_OPT)
OBJS = dynloader.o port.o OBJS = dynloader.o port.o
all: SUBSYS.o all: SUBSYS.o
...@@ -20,7 +16,7 @@ SUBSYS.o: $(OBJS) ...@@ -20,7 +16,7 @@ SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f SUBSYS.o $(OBJS) rm -f SUBSYS.o $(OBJS)
......
...@@ -4,17 +4,13 @@ ...@@ -4,17 +4,13 @@
# Makefile for port/sparc # Makefile for port/sparc
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../..
CFLAGS+=$(INCLUDE_OPT)
OBJS = isnan.o rint.o sem.o shm.o OBJS = isnan.o rint.o sem.o shm.o
all: SUBSYS.o tstrint tstsem tstshm all: SUBSYS.o tstrint tstsem tstshm
...@@ -32,7 +28,7 @@ tstshm: tstshm.o shm.o ...@@ -32,7 +28,7 @@ tstshm: tstshm.o shm.o
$(CC) -o tstshm shm.o tstshm.o $(CC) -o tstshm shm.o tstshm.o
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f SUBSYS.o $(OBJS) tstrint tstrint.o tstsem tstsem.o tstshm tstshm.o rm -f SUBSYS.o $(OBJS) tstrint tstrint.o tstsem tstsem.o tstshm tstshm.o
......
...@@ -4,17 +4,13 @@ ...@@ -4,17 +4,13 @@
# Makefile for port/sparc # Makefile for port/sparc
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../..
CFLAGS+=$(INCLUDE_OPT)
OBJS = strtol.o OBJS = strtol.o
all: SUBSYS.o all: SUBSYS.o
...@@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS) ...@@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f SUBSYS.o $(OBJS) rm -f SUBSYS.o $(OBJS)
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for postmaster # Makefile for postmaster
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
OBJS = postmaster.o OBJS = postmaster.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
# Makefile for regex # Makefile for regex
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
CFLAGS += -DPOSIX_MISTAKE CFLAGS += -DPOSIX_MISTAKE
DEBUGOBJ = DEBUGOBJ =
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for rewrite # Makefile for rewrite
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
CFLAGS += -I..
OBJS = rewriteRemove.o rewriteDefine.o \ OBJS = rewriteRemove.o rewriteDefine.o \
rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/buffer # Makefile for storage/buffer
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/file # Makefile for storage/file
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = fd.o buffile.o OBJS = fd.o buffile.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/ipc # Makefile for storage/ipc
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
# seems to be required 1999/07/22 bjm # seems to be required 1999/07/22 bjm
ifeq ($(CPU),alpha) ifeq ($(CPU),alpha)
ifeq ($(CC), gcc) ifeq ($(CC), gcc)
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/large_object # Makefile for storage/large_object
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = inv_api.o OBJS = inv_api.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/lmgr # Makefile for storage/lmgr
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = lmgr.o lock.o proc.o OBJS = lmgr.o lock.o proc.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/page # Makefile for storage/page
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = bufpage.o itemptr.o OBJS = bufpage.o itemptr.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for storage/smgr # Makefile for storage/smgr
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = md.o mm.o smgr.o smgrtype.o OBJS = md.o mm.o smgr.o smgrtype.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,14 +4,12 @@ ...@@ -4,14 +4,12 @@
# Makefile for tcop # Makefile for tcop
# #
# IDENTIFICATION # 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= ../.. SRCDIR= ../..
include ../../Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS+= -I..
ifeq ($(CC), gcc) ifeq ($(CC), gcc)
CFLAGS+= -Wno-error CFLAGS+= -Wno-error
...@@ -24,17 +22,7 @@ all: SUBSYS.o ...@@ -24,17 +22,7 @@ all: SUBSYS.o
SUBSYS.o: $(OBJS) SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
# The following dependencies are picked up by the make dep, but since depend dep:
# 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
$(CC) -MM $(CFLAGS) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include "nodes/print.h" #include "nodes/print.h"
#include "optimizer/cost.h" #include "optimizer/cost.h"
#include "optimizer/planner.h" #include "optimizer/planner.h"
#include "parser/parse.h"
#include "parser/parser.h" #include "parser/parser.h"
#include "rewrite/rewriteHandler.h" #include "rewrite/rewriteHandler.h"
#include "tcop/fastpath.h" #include "tcop/fastpath.h"
...@@ -58,9 +59,6 @@ ...@@ -58,9 +59,6 @@
#include "utils/ps_status.h" #include "utils/ps_status.h"
#include "utils/temprel.h" #include "utils/temprel.h"
#include "utils/trace.h" #include "utils/trace.h"
#include "../backend/parser/parse.h"
#ifdef MULTIBYTE #ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif #endif
...@@ -1452,7 +1450,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) ...@@ -1452,7 +1450,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); 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");
} }
/* /*
......
...@@ -4,17 +4,13 @@ ...@@ -4,17 +4,13 @@
# Makefile for tioga # Makefile for tioga
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include ../../Makefile.global include ../../Makefile.global
INCLUDE_OPT = -I..
CFLAGS+=$(INCLUDE_OPT)
OBJS = tgRecipe.o Varray.o OBJS = tgRecipe.o Varray.o
all: SUBSYS.o all: SUBSYS.o
...@@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS) ...@@ -23,7 +19,7 @@ SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
depend dep: depend dep:
$(CC) -MM $(INCLUDE_OPT) *.c >depend $(CC) -MM $(CFLAGS) *.c >depend
clean: clean:
rm -f SUBSYS.o $(OBJS) rm -f SUBSYS.o $(OBJS)
......
...@@ -4,17 +4,13 @@ ...@@ -4,17 +4,13 @@
# Makefile for utils # Makefile for utils
# #
# IDENTIFICATION # 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 = ../.. SRCDIR = ../..
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
INCLUDE_OPT = -I..
CFLAGS+=$(INCLUDE_OPT)
all: submake SUBSYS.o all: submake SUBSYS.o
OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \ OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/adt # Makefile for utils/adt
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
# seems to be required for some date/time stuff 1999/07/22 bjm # seems to be required for some date/time stuff 1999/07/22 bjm
ifeq ($(CPU),alpha) ifeq ($(CPU),alpha)
ifeq ($(CC), gcc) ifeq ($(CC), gcc)
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/cache # Makefile for utils/cache
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o \ OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o \
fcache.o temprel.o fcache.o temprel.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/error # Makefile for utils/error
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = assert.o elog.o exc.o excabort.o excid.o format.o OBJS = assert.o elog.o exc.o excabort.o excid.o format.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/fmgr # Makefile for utils/fmgr
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = dfmgr.o fmgr.o OBJS = dfmgr.o fmgr.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/hash # Makefile for utils/hash
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = dynahash.o hashfn.o OBJS = dynahash.o hashfn.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/init # Makefile for utils/init
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/mb # Makefile for utils/mb
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \ OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \
big5.o big5.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/misc # Makefile for utils/misc
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = database.o superuser.o trace.o OBJS = database.o superuser.o trace.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/mmgr # Makefile for utils/mmgr
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/sort # Makefile for utils/sort
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = logtape.o tuplesort.o OBJS = logtape.o tuplesort.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -4,15 +4,13 @@ ...@@ -4,15 +4,13 @@
# Makefile for utils/time # Makefile for utils/time
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
CFLAGS += -I../..
OBJS = tqual.o OBJS = tqual.o
all: SUBSYS.o all: SUBSYS.o
......
...@@ -6,18 +6,14 @@ ...@@ -6,18 +6,14 @@
# #
# #
# IDENTIFICATION # 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= ../.. SRCDIR= ../..
include ../../Makefile.global include $(SRCDIR)/Makefile.global
# This is a bit of hackery here: pg_encoding uses backend includes and the
# frontend library.
OBJS= pg_encoding.o OBJS= pg_encoding.o
CFLAGS:= -I$(SRCDIR)/include $(CFLAGS)
all: submake pg_encoding all: submake pg_encoding
......
...@@ -7,15 +7,13 @@ ...@@ -7,15 +7,13 @@
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# IDENTIFICATION # 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= ../.. SRCDIR= ../..
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(SRCDIR)/include
OBJS= pg_version.o $(SRCDIR)/utils/version.o @STRERROR2@ OBJS= pg_version.o $(SRCDIR)/utils/version.o @STRERROR2@
all: pg_version all: pg_version
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# IDENTIFICATION # 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 ...@@ -17,9 +17,7 @@ SO_MINOR_VERSION= 1
SRCDIR= @top_srcdir@ SRCDIR= @top_srcdir@
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(SRCDIR)/backend \ CFLAGS+= -I$(LIBPQDIR)
-I$(SRCDIR)/include \
-I$(LIBPQDIR)
ifdef KRBVERS ifdef KRBVERS
CFLAGS+= $(KRBFLAGS) CFLAGS+= $(KRBFLAGS)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# IDENTIFICATION # 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@ ...@@ -23,9 +23,7 @@ CXXFLAGS=@CXXFLAGS@
SRCHEADERDIR = $(SRCDIR)/include SRCHEADERDIR = $(SRCDIR)/include
LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
CXXFLAGS+= -I$(SRCDIR)/backend \ CXXFLAGS+= -I$(SRCHEADERDIR) -I$(LIBPQDIR)
-I$(SRCHEADERDIR) \
-I$(LIBPQDIR)
ifdef KRBVERS ifdef KRBVERS
CXXFLAGS+= $(KRBFLAGS) CXXFLAGS+= $(KRBFLAGS)
......
...@@ -15,9 +15,7 @@ LIBPQDIR= /usr/local/pgsql/lib ...@@ -15,9 +15,7 @@ LIBPQDIR= /usr/local/pgsql/lib
#CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic #CXXFLAGS= $(CFLAGS) -Wno-error -Wno-unused -Wl,-Bdynamic
CXXFLAGS= $(CFLAGS) CXXFLAGS= $(CFLAGS)
INCLUDE_OPT= -I$(HEADERDIR) CXXFLAGS+= -I$(HEADERDIR)
CXXFLAGS+= $(INCLUDE_OPT)
LDFLAGS+= -L$(LIBPQDIR) -lpq++ LDFLAGS+= -L$(LIBPQDIR) -lpq++
......
...@@ -54,7 +54,7 @@ my $perllib = "-L$Config{archlibexp}/CORE -lperl"; ...@@ -54,7 +54,7 @@ my $perllib = "-L$Config{archlibexp}/CORE -lperl";
WriteMakefile( 'NAME' => 'plperl', WriteMakefile( 'NAME' => 'plperl',
dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } , 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' }, XS => { 'SPI.xs' => 'SPI.c' },
OBJECT => 'plperl.o eloglvl.o SPI.o', OBJECT => 'plperl.o eloglvl.o SPI.o',
); );
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for the plpgsql shared object # Makefile for the plpgsql shared object
# #
# IDENTIFICATION # 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 ...@@ -15,8 +15,6 @@ SO_MINOR_VERSION= 0
SRCDIR= @top_srcdir@ SRCDIR= @top_srcdir@
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
# If using flex, ask for a case-insensitive, lex-compatible lexer. # If using flex, ask for a case-insensitive, lex-compatible lexer.
ifneq (,$(findstring flex,$(LEX))) ifneq (,$(findstring flex,$(LEX)))
LFLAGS+= -i -l LFLAGS+= -i -l
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for the pltcl shared object # Makefile for the pltcl shared object
# #
# IDENTIFICATION # 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) ...@@ -70,7 +70,7 @@ CFLAGS= $(TCL_CFLAGS_OPTIMIZE)
CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS) 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 # Uncomment the following to enable the unknown command lookup
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 ...@@ -18,7 +18,7 @@ CONTRIB= $(SRCDIR)/../contrib
HOST= @host@ HOST= @host@
CFLAGS+= -I$(LIBPQDIR) -I$(SRCDIR)/include $(CFLAGS_SL) CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
LDADD+= -L$(LIBPQDIR) -lpq LDADD+= -L$(LIBPQDIR) -lpq
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
# Makefile for tutorial # Makefile for tutorial
# #
# IDENTIFICATION # 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= .. SRCDIR= ..
include $(SRCDIR)/Makefile.global include $(SRCDIR)/Makefile.global
CFLAGS+= -I$(SRCDIR)/include $(CFLAGS_SL) CFLAGS+= $(CFLAGS_SL)
# #
# DLOBJS is the dynamically-loaded object files. The "funcs" queries # DLOBJS is the dynamically-loaded object files. The "funcs" queries
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment