Removed MBFLAGS from makefiles since it's now done in include/config.h.

[postgresql] / src / backend / commands / Makefile

diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index 9e57883debad4127d9d8b5dbb7ee2bfb0e0c9c49..b0ee3f1e0df218c5445255fa1c3720cc5d54d3f5 100644 (file)
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,30 +4,36 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.8 1997/12/04 00:26:44 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.23 2000/01/19 02:58:51 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../../include
+CFLAGS += -I..
 
-CFLAGS+=$(INCLUDE_OPT)
-
-OBJS = async.o creatinh.o command.o copy.o defind.o define.o \
-       remove.o rename.o vacuum.o version.o view.o cluster.o \
-       recipe.o explain.o sequence.o trigger.o user.o proclang.o dbcommands.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 \
+       explain.o sequence.o trigger.o user.o proclang.o \
+       dbcommands.o variable.o
 
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
-       $(LD) -r -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 $(INCLUDE_OPT) *.c >depend
+       $(CC) -MM $(CFLAGS) *.c >depend
 
 clean: 
        rm -f SUBSYS.o $(OBJS)