From: t-ishii@sra.co.jp

[postgresql] / src / backend / utils / Makefile

diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index a0a95ead8fd314d28290f8eae84ee5ec56df6534..b28d37f9d55b2934f2d40074f9102e2d19b47216 100644 (file)
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -4,15 +4,14 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.4 1996/11/09 06:22:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.8 1998/07/26 04:30:50 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../../include
+INCLUDE_OPT = -I.. 
 
 CFLAGS+=$(INCLUDE_OPT)
 
@@ -22,21 +21,19 @@ OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \
        fmgr/SUBSYS.o hash/SUBSYS.o init/SUBSYS.o misc/SUBSYS.o mmgr/SUBSYS.o \
        sort/SUBSYS.o time/SUBSYS.o
 
+DIRS = adt cache error fmgr hash init misc mmgr sort time
+
+ifdef MULTIBYTE
+OBJS += mb/SUBSYS.o
+DIRS += mb
+endif
+
 SUBSYS.o: $(OBJS) 
        $(LD) -r -o SUBSYS.o $(OBJS)
 
 .PHONY: submake clean dep
 submake:
-       $(MAKE) -C adt SUBSYS.o
-       $(MAKE) -C cache SUBSYS.o
-       $(MAKE) -C error SUBSYS.o
-       $(MAKE) -C fmgr SUBSYS.o
-       $(MAKE) -C hash SUBSYS.o
-       $(MAKE) -C init SUBSYS.o
-       $(MAKE) -C misc SUBSYS.o
-       $(MAKE) -C mmgr SUBSYS.o
-       $(MAKE) -C sort SUBSYS.o
-       $(MAKE) -C time SUBSYS.o
+       for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done
 
 fmgrtab.o: ../fmgr.h
 
@@ -48,29 +45,10 @@ fmgr.h fmgrtab.c: ./Gen_fmgrtab.sh ../../include/catalog/pg_proc.h
 
 clean:
        rm -f SUBSYS.o fmgr.h fmgrtab.o fmgrtab.c
-       $(MAKE) -C adt   clean 
-       $(MAKE) -C cache clean 
-       $(MAKE) -C error clean 
-       $(MAKE) -C fmgr  clean 
-       $(MAKE) -C hash  clean 
-       $(MAKE) -C init  clean 
-       $(MAKE) -C misc  clean 
-       $(MAKE) -C mmgr  clean 
-       $(MAKE) -C sort  clean 
-       $(MAKE) -C time  clean 
-
-dep: fmgr.h fmgrtab.c
-       $(CC) -MM $(INCLUDE_OPT) *.c >depend
-       $(MAKE) -C adt   dep 
-       $(MAKE) -C cache dep 
-       $(MAKE) -C error dep 
-       $(MAKE) -C fmgr  dep 
-       $(MAKE) -C hash  dep 
-       $(MAKE) -C init  dep 
-       $(MAKE) -C misc  dep 
-       $(MAKE) -C mmgr  dep 
-       $(MAKE) -C sort  dep 
-       $(MAKE) -C time  dep 
+       for i in $(DIRS); do $(MAKE) -C $$i clean; done
+
+dep depend: fmgr.h fmgrtab.c
+       for i in $(DIRS); do $(MAKE) -C $$i depend; done
 
 ifeq (depend,$(wildcard depend))
 include depend