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

[postgresql] / src / backend / bootstrap / Makefile

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index b528490fb5bd5bd0c5688a0b15178627651e490d..b9f9270416e35e219adb5d7f3495fe9d50d1d100 100644 (file)
--- 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.18 1999/12/16 01:25:01 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.21 2000/01/19 02:58:51 petere Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -22,9 +22,6 @@ SRCDIR= ../..
 include ../../Makefile.global
 
 CFLAGS += -I..
-ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
-endif
 
 ifeq ($(CC), gcc)
 CFLAGS+= -Wno-error
@@ -32,17 +29,20 @@ endif
 
 BOOTYACCS= bootstrap_tokens.h bootparse.c
 
-ifneq ($(PORTNAME), qnx4)
 OBJS= bootparse.o bootscanner.o bootstrap.o 
-else
-# wlink crashes with bootstrap.o
-OBJS= bootparse.o bootscanner.o
+ifeq ($(PORTNAME), qnx4)
+# wlink currently crashes with bootstrap.o
+OBJS1= bootparse.o bootscanner.o
 endif
 
 all: SUBSYS.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 +65,7 @@ bootscanner.c: bootscanner.l
        rm -f lex.yy.c sedfile
 
 clean:
-       rm -f SUBSYS.o $(OBJS) bootparse.c bootstrap_tokens.h bootscanner.c
+       rm -f SUBSYS.o $(OBJS)
 # 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