From: t-ishii@sra.co.jp

[postgresql] / src / backend / tcop / Makefile

diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 4dd7fbcb5f685fa04d6769939a5bad1b4069f211..44b755242accbc6971d6037f0c67204e1ce582ce 100644 (file)
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,32 +4,48 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.4 1996/11/08 05:59:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.18 1998/07/26 04:30:46 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
-SRCDIR = ../..
+SRCDIR= ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I../port/$(PORTNAME) \
-              -I../../include
+CFLAGS+= -I..
 
-CFLAGS+=$(INCLUDE_OPT) -Wno-error
+ifdef MULTIBYTE
+CFLAGS+= $(MBFLAGS)
+endif
+
+ifeq ($(CC), gcc)
+CFLAGS+= -Wno-error
+endif
 
-OBJS = aclchk.o dest.o fastpath.o postgres.o pquery.o utility.o
+OBJS= dest.o fastpath.o postgres.o pquery.o utility.o
 
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
        $(LD) -r -o SUBSYS.o $(OBJS)
 
-utility.o: ../parse.h
+# 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 ../fmgr.h
+aclchk.o: ../fmgr.h
+fastpath.o: ../fmgr.h
+postgres.o: ../fmgr.h
 
 ../parse.h: 
-       gmake -C .. parse.h
+       $(MAKE) -C .. parse.h
+
+../fmgr.h: 
+       $(MAKE) -C .. fmgr.h
 
-dep: ../parse.h
-       $(CC) -MM $(INCLUDE_OPT) *.c >depend
+dep depend: ../parse.h ../fmgr.h
+       $(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
        rm -f SUBSYS.o $(OBJS)