Refactor backend makefiles to remove lots of duplicate code

diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile
index bf42037a9ff3dd6f2d39c0ee02159792aec96e2a..cfbb5a5d35ad9132ec6d840a4568b4553ad87766 100644 (file)
--- a/src/backend/access/Makefile
+++ b/src/backend/access/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the access methods module
 #
-# $PostgreSQL: pgsql/src/backend/access/Makefile,v 1.13 2007/02/09 15:55:58 petere Exp $
+# $PostgreSQL: pgsql/src/backend/access/Makefile,v 1.14 2008/02/19 10:30:06 petere Exp $
 #
 
 subdir = src/backend/access
@@ -9,19 +9,5 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 SUBDIRS            = common gist hash heap index nbtree transam gin
-SUBDIROBJS  = $(SUBDIRS:%=%/SUBSYS.o)
 
-all: SUBSYS.o
-
-SUBSYS.o: $(SUBDIROBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
-
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
-
-.PHONY: $(SUBDIRS:%=%-recursive)
-$(SUBDIRS:%=%-recursive):
-       $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
-
-clean:
-       for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
-       rm -f SUBSYS.o
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index 57a3d5d66d9a570d3b31d0922536e1288533c1d0..e904f611e8ab1fabbca20399856cfa856d1a63a2 100644 (file)
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/common/Makefile,v 1.23 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/common/Makefile,v 1.24 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,8 +16,4 @@ OBJS = heaptuple.o indextuple.o printtup.o reloptions.o scankey.o tupdesc.o
 
 all: SUBSYS.o
 
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/gin/Makefile b/src/backend/access/gin/Makefile
index 4af8b316307f14cd43cdb22fc9bb5b6ffc885045..08946c88a73026f789c633684773cfe575901c01 100644 (file)
--- a/src/backend/access/gin/Makefile
+++ b/src/backend/access/gin/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/gin
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/gin/Makefile,v 1.2 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/gin/Makefile,v 1.3 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,10 +16,4 @@ OBJS = ginutil.o gininsert.o ginxlog.o ginentrypage.o gindatapage.o \
        ginbtree.o ginscan.o ginget.o ginvacuum.o ginarrayproc.o \
        ginbulk.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile
index 6c9e360d9d536e8bf24ee9c39c5107926e84cbda..298e9309f5351ef3440a92c9ff48992a6f2fd4fc 100644 (file)
--- a/src/backend/access/gist/Makefile
+++ b/src/backend/access/gist/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/gist
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/gist/Makefile,v 1.17 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/gist/Makefile,v 1.18 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = gist.o gistutil.o gistxlog.o gistvacuum.o gistget.o gistscan.o \
        gistproc.o gistsplit.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile
index 3df215256892e6ddb0e78fde4dd29871018d53cc..38eb29125391cc0ffc94b6c7e1b9f9364f83b272 100644 (file)
--- a/src/backend/access/hash/Makefile
+++ b/src/backend/access/hash/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/hash
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/hash/Makefile,v 1.13 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/hash/Makefile,v 1.14 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \
        hashsearch.o hashutil.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile
index aff2847bab5a36cb392f094b7db24df5218bbd12..66175ae7da8ed916a7a363d2bac515676bfacc53 100644 (file)
--- a/src/backend/access/heap/Makefile
+++ b/src/backend/access/heap/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/heap
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/heap/Makefile,v 1.17 2007/09/20 17:56:30 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/access/heap/Makefile,v 1.18 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = heapam.o hio.o pruneheap.o rewriteheap.o syncscan.o tuptoaster.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile
index 52debbf53431d9b396ed90a8458f83f1c53c66a7..6357a43f89bb9ec0620e107c272469901634758c 100644 (file)
--- a/src/backend/access/index/Makefile
+++ b/src/backend/access/index/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/index
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/index/Makefile,v 1.13 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/index/Makefile,v 1.14 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = genam.o indexam.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile
index 1bd3c249d1855b5d146a8c1373809735392333c4..676ae3c270c37690531b68166715736e3b5297d1 100644 (file)
--- a/src/backend/access/nbtree/Makefile
+++ b/src/backend/access/nbtree/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/nbtree
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/nbtree/Makefile,v 1.15 2007/01/20 17:16:10 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/access/nbtree/Makefile,v 1.16 2008/02/19 10:30:06 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtsearch.o \
        nbtutils.o nbtsort.o nbtxlog.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile
index c6ecef17246d1d8ba62c5fdc76070095c8f26bda..38cfe1a277ac1cb64b2cca511b9b52b088282a80 100644 (file)
--- a/src/backend/access/transam/Makefile
+++ b/src/backend/access/transam/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/transam
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/transam/Makefile,v 1.21 2005/06/17 22:32:42 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/access/transam/Makefile,v 1.22 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,13 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = clog.o transam.o varsup.o xact.o xlog.o xlogutils.o rmgr.o slru.o subtrans.o multixact.o twophase.o twophase_rmgr.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk
 
 # ensure that version checks in xlog.c get recompiled when catversion.h changes
 xlog.o: xlog.c $(top_srcdir)/src/include/catalog/catversion.h

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 314826e4f4bbf4d44b6db7983312a29dd818446e..ac83245395d2a91065fcedcd954986789b3f8879 100644 (file)
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the bootstrap module
 #
-# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.35 2007/01/20 17:16:11 petere Exp $
+# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.36 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
 OBJS= bootparse.o bootstrap.o 
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
+include $(top_srcdir)/src/backend/common.mk
 
 
 # bootscanner is compiled as part of bootparse
@@ -50,6 +47,5 @@ bootstrap.o bootparse.o: $(srcdir)/bootstrap_tokens.h
 # bootparse.c, bootstrap_tokens.h, and bootscanner.c are in the distribution
 # tarball, so they are not cleaned here.
 clean:
-       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

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 6e87b2f6010bab2cb7bbe117ab9993d64224e412..9023c795ec1b9ae80cceae6edd0813325ff8eb12 100644 (file)
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for backend/catalog
 #
-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.65 2007/08/21 01:11:13 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.66 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,10 +17,9 @@ OBJS = catalog.o dependency.o heap.o index.o indexing.o namespace.o aclchk.o \
 
 BKIFILES = postgres.bki postgres.description postgres.shdescription
 
-all: SUBSYS.o $(BKIFILES)
+include $(top_srcdir)/src/backend/common.mk
 
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+all: $(BKIFILES)
 
 # Note: there are some undocumented dependencies on the ordering in which
 # the catalog header files are assembled into postgres.bki.  In particular,
@@ -67,4 +66,4 @@ uninstall-data:
        rm -f $(addprefix '$(DESTDIR)$(datadir)'/, $(BKIFILES) system_views.sql information_schema.sql sql_features.txt)
 
 clean:
-       rm -f SUBSYS.o $(OBJS) $(BKIFILES)
+       rm -f $(BKIFILES)

diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index e47b8f91facef3d77eda0034bf907241677e323f..49aefde416458e3cf59ffa1e9c6206e8c09d7abd 100644 (file)
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for backend/commands
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/commands/Makefile,v 1.37 2007/08/21 01:11:14 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/commands/Makefile,v 1.38 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,10 +21,4 @@ OBJS = aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o  \
        tsearchcmds.o typecmds.o user.o vacuum.o vacuumlazy.o \
        variable.o view.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/common.mk b/src/backend/common.mk
new file mode 100644 (file)
index 0000000..daa1f54
--- /dev/null
+++ b/src/backend/common.mk
@@ -0,0 +1,25 @@
+#
+# Common make rules for backend
+#
+# $PostgreSQL: pgsql/src/backend/common.mk,v 1.1 2008/02/19 10:30:06 petere Exp $
+#
+
+SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)
+
+all: SUBSYS.o
+
+SUBSYS.o: $(SUBDIROBJS) $(OBJS)
+       $(LD) $(LDREL) $(LDOUT) $@ $^
+
+$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
+
+.PHONY: $(SUBDIRS:%=%-recursive)
+$(SUBDIRS:%=%-recursive):
+       $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
+
+clean: clean-local
+clean-local:
+ifdef SUBDIRS
+       for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done
+endif
+       rm -f SUBSYS.o $(OBJS)

diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
index cb4ab9dc31a1430226bbe6cb34a3b8baf9d5195d..38364a9cd1388519cc1de175d5ec0cd2d790100a 100644 (file)
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for executor
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/executor/Makefile,v 1.26 2007/06/11 01:16:22 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/executor/Makefile,v 1.27 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,10 +23,4 @@ OBJS = execAmi.o execCurrent.o execGrouping.o execJunk.o execMain.o \
        nodeValuesscan.o nodeLimit.o nodeGroup.o \
        nodeSubplan.o nodeSubqueryscan.o nodeTidscan.o tstoreReceiver.o spi.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile
index ae456e5934b91c79cf3dbb665fd49c3a6392bcaa..d25fcc7a8ab33c1112bd3bc3f2e124b36e2a37a5 100644 (file)
--- a/src/backend/lib/Makefile
+++ b/src/backend/lib/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for lib (miscellaneous stuff)
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/lib/Makefile,v 1.20 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/lib/Makefile,v 1.21 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = dllist.o stringinfo.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index dc779fff667d1ea4be36c4616366531db6571983..d881d569c46e28c5e349e3fcb7ba5a03530eba26 100644 (file)
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/libpq/Makefile,v 1.38 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/libpq/Makefile,v 1.39 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,11 +17,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = be-fsstubs.o be-secure.o auth.o crypt.o hba.o ip.o md5.o pqcomm.o \
        pqformat.o pqsignal.o
 
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile
index fab1ede3a9b11cee7dc375e166305e35878c31e8..7c16a15c764a24ed6ab1eaaabf524a8878a57948 100644 (file)
--- a/src/backend/main/Makefile
+++ b/src/backend/main/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for main
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/main/Makefile,v 1.11 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/main/Makefile,v 1.12 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = main.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile
index 56fd8584acbf08ceef6c75c02913fff2c48bf0bf..8c3cc54b85741b9256315f6bbc13e33f5a9a0a22 100644 (file)
--- a/src/backend/nodes/Makefile
+++ b/src/backend/nodes/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for backend/nodes
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/nodes/Makefile,v 1.19 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/nodes/Makefile,v 1.20 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,10 +16,4 @@ OBJS = nodeFuncs.o nodes.o list.o bitmapset.o tidbitmap.o \
        copyfuncs.o equalfuncs.o makefuncs.o \
        outfuncs.o readfuncs.o print.o read.o params.o value.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile
index ef63ef11614c49e26d143247b1a9fa2ffcdd5c73..d134f907353cb6091959105a823db7dfe38f57b6 100644 (file)
--- a/src/backend/optimizer/Makefile
+++ b/src/backend/optimizer/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for optimizer
 #
-# $PostgreSQL: pgsql/src/backend/optimizer/Makefile,v 1.13 2007/02/09 15:55:58 petere Exp $
+# $PostgreSQL: pgsql/src/backend/optimizer/Makefile,v 1.14 2008/02/19 10:30:07 petere Exp $
 #
 
 subdir = src/backend/optimizer
@@ -9,19 +9,5 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 SUBDIRS     = geqo path plan prep util
-SUBDIROBJS  = $(SUBDIRS:%=%/SUBSYS.o)
 
-all: SUBSYS.o
-
-SUBSYS.o: $(SUBDIROBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
-
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
-
-.PHONY: $(SUBDIRS:%=%-recursive)
-$(SUBDIRS:%=%-recursive):
-       $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
-
-clean:
-       for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
-       rm -f SUBSYS.o
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile
index b826f6d4f304726b253f457a5bca7dd4a3948ac8..becc95f2ef4378b6fb2bd4f7d231a18c8debfc93 100644 (file)
--- a/src/backend/optimizer/geqo/Makefile
+++ b/src/backend/optimizer/geqo/Makefile
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/backend/optimizer/geqo/Makefile,v 1.19 2007/01/20 17:16:11 petere Exp $
+# $PostgreSQL: pgsql/src/backend/optimizer/geqo/Makefile,v 1.20 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,10 +18,4 @@ OBJS =       geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
        geqo_selection.o \
        geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile
index 833b3f59a3758b5a658ca50c6553740d2cc5e27f..77be4e4d17bcf4ca9c3a5866db1446644347404e 100644 (file)
--- a/src/backend/optimizer/path/Makefile
+++ b/src/backend/optimizer/path/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for optimizer/path
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/optimizer/path/Makefile,v 1.18 2007/01/20 20:45:38 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/optimizer/path/Makefile,v 1.19 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = allpaths.o clausesel.o costsize.o equivclass.o indxpath.o \
        joinpath.o joinrels.o orindxpath.o pathkeys.o tidpath.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile
index 3b7ba88879f15821c4964f8bece321b40a97b0d9..2aa976d5fb1142332a17a216cae004a048310b1d 100644 (file)
--- a/src/backend/optimizer/plan/Makefile
+++ b/src/backend/optimizer/plan/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for optimizer/plan
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/optimizer/plan/Makefile,v 1.14 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/optimizer/plan/Makefile,v 1.15 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = createplan.o initsplan.o planagg.o planmain.o planner.o \
        setrefs.o subselect.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile
index 712b5dbe3ebb2bf30f201f889b39ec00fff373cb..13bd3394c675aabc4383ca4fd1a245aae6a12e3c 100644 (file)
--- a/src/backend/optimizer/prep/Makefile
+++ b/src/backend/optimizer/prep/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for optimizer/prep
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/optimizer/prep/Makefile,v 1.16 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/optimizer/prep/Makefile,v 1.17 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = prepjointree.o prepqual.o preptlist.o prepunion.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile
index 5889c572eeba92f8ea96dd5afb8d4a99cb62338d..0ea1dc32cc1f182648d0bb0abe40250bb02e2bac 100644 (file)
--- a/src/backend/optimizer/util/Makefile
+++ b/src/backend/optimizer/util/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for optimizer/util
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/optimizer/util/Makefile,v 1.17 2007/01/20 17:16:11 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/optimizer/util/Makefile,v 1.18 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = clauses.o joininfo.o pathnode.o plancat.o predtest.o \
        relnode.o restrictinfo.o tlist.o var.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index 2296dcb6206fce559e5729dbc81ea0977363e68e..9a2d58419dc83c5f084937e76c4ac1556dba69f5 100644 (file)
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for parser
 #
-# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.45 2007/06/23 22:12:51 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.46 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,11 +18,7 @@ OBJS= analyze.o gram.o keywords.o parser.o parse_agg.o parse_clause.o \
 
 FLEXFLAGS = -CF
 
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
+include $(top_srcdir)/src/backend/common.mk
 
 
 # scan is compiled as part of gram
@@ -63,6 +59,5 @@ gram.o keywords.o parser.o: $(srcdir)/parse.h
 # gram.c, parse.h, and scan.c are in the distribution tarball, so they
 # are not cleaned here.
 clean: 
-       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

diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 3608cd5c4b74fb313688b33840be88255da88df2..a3617af986f0fad821c9572c447c514838fb6863 100644 (file)
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -13,7 +13,7 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.24 2007/01/07 08:49:31 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.25 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,10 +32,7 @@ ifeq ($(PORTNAME), win32)
 OBJS+=win32/SUBSYS.o
 endif
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
+include $(top_srcdir)/src/backend/common.mk
 
 darwin/SUBSYS.o: darwin.dir
 
@@ -62,6 +59,6 @@ ipc_test: ipc_test.o pg_sema.o pg_shmem.o
        $(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o $@
 
 distclean clean:
-       rm -f SUBSYS.o $(OBJS) ipc_test ipc_test.o tas_cpp.s
+       rm -f ipc_test ipc_test.o tas_cpp.s
        $(MAKE) -C darwin clean
        $(MAKE) -C win32 clean

diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile
index 7ccba285f2149e173921e7e3a6e9debf1074ad7b..008c6a4e9fdcb1af3f52c86295643701bb90c514 100644 (file)
--- a/src/backend/postmaster/Makefile
+++ b/src/backend/postmaster/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for src/backend/postmaster
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.23 2007/07/24 04:54:09 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.24 2008/02/19 10:30:07 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = autovacuum.o bgwriter.o fork_process.o pgarch.o pgstat.o postmaster.o \
        syslogger.o walwriter.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile
index 4fbdd08d875b6eeda54bb330a45c13d509b22f37..146a3d5b3434fe198163c326e6111c513579abdf 100644 (file)
--- a/src/backend/regex/Makefile
+++ b/src/backend/regex/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for backend/regex
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/regex/Makefile,v 1.21 2003/11/29 19:51:55 pgsql Exp $
+#    $PostgreSQL: pgsql/src/backend/regex/Makefile,v 1.22 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,15 +14,9 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = regcomp.o regerror.o regexec.o regfree.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk
 
 # mark inclusion dependencies between .c files explicitly
 regcomp.o: regcomp.c regc_lex.c regc_color.c regc_nfa.c regc_cvec.c regc_locale.c
 
 regexec.o: regexec.c rege_dfa.c
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)

diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile
index 29540f1d1d6ecac47810e3384fcfe6197bf8590e..4f2eae5e99674b67924e3c4ed324a14f45995b63 100644 (file)
--- a/src/backend/rewrite/Makefile
+++ b/src/backend/rewrite/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for rewrite
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/rewrite/Makefile,v 1.16 2007/01/20 17:16:12 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/rewrite/Makefile,v 1.17 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = rewriteRemove.o rewriteDefine.o \
        rewriteHandler.o rewriteManip.o rewriteSupport.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile
index 06d90b2a3cc9f3971532dd13bb224711d5a09476..6b7a37c5359132a27b7fa9a4388ee61ba7fa6dd8 100644 (file)
--- a/src/backend/storage/Makefile
+++ b/src/backend/storage/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the storage manager subsystem
 #
-# $PostgreSQL: pgsql/src/backend/storage/Makefile,v 1.13 2007/02/09 15:55:58 petere Exp $
+# $PostgreSQL: pgsql/src/backend/storage/Makefile,v 1.14 2008/02/19 10:30:08 petere Exp $
 #
 
 subdir = src/backend/storage
@@ -9,19 +9,5 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 SUBDIRS     = buffer file freespace ipc large_object lmgr page smgr
-SUBDIROBJS  = $(SUBDIRS:%=%/SUBSYS.o)
 
-all: SUBSYS.o
-
-SUBSYS.o: $(SUBDIROBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
-
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
-
-.PHONY: $(SUBDIRS:%=%-recursive)
-$(SUBDIRS:%=%-recursive):
-       $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
-
-clean:
-       for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
-       rm -f SUBSYS.o
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile
index 45c8d68fe863360fb28de82ee7eb3b9e72b1ad09..15c2828d9c73a6cb559e588ab02c8a0293deda18 100644 (file)
--- a/src/backend/storage/buffer/Makefile
+++ b/src/backend/storage/buffer/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/buffer
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/buffer/Makefile,v 1.18 2007/01/20 17:16:12 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/buffer/Makefile,v 1.19 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile
index 95a316009b5a9b6c7b35bca3674d976913e65ead..c891f704eb760b5c5e656f1b17ca4089569bb6ce 100644 (file)
--- a/src/backend/storage/file/Makefile
+++ b/src/backend/storage/file/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/file
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/file/Makefile,v 1.12 2007/01/20 17:16:12 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/file/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = fd.o buffile.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/freespace/Makefile b/src/backend/storage/freespace/Makefile
index ef43c1054c16370de6c11f6e32abb1206b03191b..553131d8f063426188da88f524fd872915810c44 100644 (file)
--- a/src/backend/storage/freespace/Makefile
+++ b/src/backend/storage/freespace/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/freespace
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/freespace/Makefile,v 1.3 2007/01/20 17:16:12 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/freespace/Makefile,v 1.4 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = freespace.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile
index 6fa8bae781670395119c948443c1f0875db84b46..cc74f8812bbdfd4c360bc176e5d8c7ce7a419cb9 100644 (file)
--- a/src/backend/storage/ipc/Makefile
+++ b/src/backend/storage/ipc/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for storage/ipc
 #
-# $PostgreSQL: pgsql/src/backend/storage/ipc/Makefile,v 1.20 2007/01/20 17:16:12 petere Exp $
+# $PostgreSQL: pgsql/src/backend/storage/ipc/Makefile,v 1.21 2008/02/19 10:30:08 petere Exp $
 #
 
 subdir = src/backend/storage/ipc
@@ -18,10 +18,4 @@ endif
 OBJS = ipc.o ipci.o pmsignal.o procarray.o shmem.o shmqueue.o \
        sinval.o sinvaladt.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile
index 5fd938de7fb5008f2036f5a0e7c06949464c7034..45de988d5ce82e5a8b9d6dab3b41de01248c7be1 100644 (file)
--- a/src/backend/storage/large_object/Makefile
+++ b/src/backend/storage/large_object/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/large_object
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/large_object/Makefile,v 1.12 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/large_object/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = inv_api.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile
index ce0d54adcc5ea6e4b5bc1154b327962778dab325..d2e1a05792083871b03e2b6a09a605d72484d040 100644 (file)
--- a/src/backend/storage/lmgr/Makefile
+++ b/src/backend/storage/lmgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/lmgr
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/lmgr/Makefile,v 1.22 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/lmgr/Makefile,v 1.23 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = lmgr.o lock.o proc.o deadlock.o lwlock.o spin.o s_lock.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk
 
 ifdef TAS
 TASPATH = $(top_builddir)/src/backend/port/tas.o
@@ -31,4 +28,4 @@ check: s_lock_test
        ./s_lock_test
 
 clean distclean maintainer-clean: 
-       rm -f SUBSYS.o $(OBJS) s_lock_test
+       rm -f s_lock_test

diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile
index 30f4be946ca6e69ca3fa95b4f45304697f71b47a..8af2341312e67704f1731d0da856b444dd5c053e 100644 (file)
--- a/src/backend/storage/page/Makefile
+++ b/src/backend/storage/page/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/page
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/page/Makefile,v 1.12 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/page/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS =  bufpage.o itemptr.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile
index 301356ee44d68cd2d8b4fdead9b90b6376ff5793..9e9ec866c3228ea654696637bc4a526921e52123 100644 (file)
--- a/src/backend/storage/smgr/Makefile
+++ b/src/backend/storage/smgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for storage/smgr
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/storage/smgr/Makefile,v 1.16 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/storage/smgr/Makefile,v 1.17 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = md.o smgr.o smgrtype.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 87ad181eda9ec4badbb7cce15e34999c705fcc37..0b8f3a6e031c9b13f286c8885daf88b5abf38a52 100644 (file)
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/tcop/Makefile,v 1.28 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/tcop/Makefile,v 1.29 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,10 +18,4 @@ ifneq (,$(filter $(PORTNAME),cygwin win32))
 override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
 endif
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS) 
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile
index 96cbb32715b490feeb9c53946fa02cca11309497..9ee7a7ea533118393dc8e99babb1dc773c3d9e03 100644 (file)
--- a/src/backend/tsearch/Makefile
+++ b/src/backend/tsearch/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2006-2008, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.5 2008/02/18 16:04:32 petere Exp $
+# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.6 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 subdir = src/backend/tsearch
@@ -21,13 +21,7 @@ OBJS = ts_locale.o ts_parse.o wparser.o wparser_def.o dict.o \
        dict_ispell.o regis.o spell.o \
        to_tsany.o ts_utils.o
 
-all: SUBSYS.o 
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $^
-
-depend dep:
-       $(CC) -MM $(CFLAGS) *.c >depend
+include $(top_srcdir)/src/backend/common.mk
 
 .PHONY: install-data
 install-data: $(DICTFILES) installdirs
@@ -43,10 +37,3 @@ uninstall-data:
        for i in $(DICTFILES); \
                do rm -rf '$(DESTDIR)$(datadir)/$(DICTDIR)/'$$i || exit; \
        done
-
-clean distclean maintainer-clean: 
-       rm -f SUBSYS.o $(OBJS)
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif

diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index cd886d17fb7d61024d1dc5d757b31969e03e073c..0e3b9500f5bc657fb0157b9cd59a3319b944de99 100644 (file)
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -1,32 +1,24 @@
 #
 # Makefile for utils
 #
-# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.25 2007/02/09 15:55:58 petere Exp $
+# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.26 2008/02/19 10:30:08 petere Exp $
 #
 
 subdir = src/backend/utils
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
+OBJS        = fmgrtab.o
 SUBDIRS     = adt cache error fmgr hash init mb misc mmgr resowner sort time
-SUBDIROBJS  = $(SUBDIRS:%=%/SUBSYS.o)
 
+include $(top_srcdir)/src/backend/common.mk
 
-all: SUBSYS.o fmgroids.h
+all: fmgroids.h
 
-SUBSYS.o: fmgrtab.o $(SUBDIROBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
-
-$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
-
-.PHONY: $(SUBDIRS:%=%-recursive)
 $(SUBDIRS:%=%-recursive): fmgroids.h
-       $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
 
 fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc.h
        AWK='$(AWK)' $(SHELL) $< $(top_srcdir)/src/include/catalog/pg_proc.h
 
-
 clean:
-       for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
-       rm -f SUBSYS.o fmgrtab.o fmgroids.h fmgrtab.c
+       rm -f fmgroids.h fmgrtab.c

diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 4b90e0739e6c375fe69687046a47729c124b67e0..991684a3331ce166efcc809e0d9fc656750f32dc 100644 (file)
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for utils/adt
 #
-# $PostgreSQL: pgsql/src/backend/utils/adt/Makefile,v 1.68 2007/10/13 23:06:26 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/utils/adt/Makefile,v 1.69 2008/02/19 10:30:08 petere Exp $
 #
 
 subdir = src/backend/utils/adt
@@ -33,10 +33,4 @@ OBJS = acl.o arrayfuncs.o array_userfuncs.o arrayutils.o bool.o \
 
 like.o: like.c like_match.c
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile
index 7ad1cda6c73f54675b3ba84c0ed9b836733cd895..1766c0315f872f2692117e7f1f276af7bea442de 100644 (file)
--- a/src/backend/utils/cache/Makefile
+++ b/src/backend/utils/cache/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/cache
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/cache/Makefile,v 1.22 2007/08/21 01:11:19 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/cache/Makefile,v 1.23 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,10 +15,4 @@ include $(top_builddir)/src/Makefile.global
 OBJS = catcache.o inval.o plancache.o relcache.o \
        syscache.o lsyscache.o typcache.o ts_cache.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile
index dc1fdac7e2d277a84f13779a01c0c1d24a33b88c..b5435b578e9244eed756fb2c62218f1e81dbe558 100644 (file)
--- a/src/backend/utils/error/Makefile
+++ b/src/backend/utils/error/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/error
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/error/Makefile,v 1.12 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/error/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = assert.o elog.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile
index 6fcd0d1a15c473681307fb8205f72900f1d95ee7..ea98626a3e067b728200880f226c2ea40dc780a0 100644 (file)
--- a/src/backend/utils/fmgr/Makefile
+++ b/src/backend/utils/fmgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/fmgr
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.17 2004/05/21 20:56:49 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.18 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,11 +16,4 @@ OBJS = dfmgr.o fmgr.o funcapi.o
 
 override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\"
 
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile
index 7b5e726be83ef04f097a757cd5e41c00bd528f5b..3f6233912e5c96d3f5f80344231ebd9a6ec79302 100644 (file)
--- a/src/backend/utils/hash/Makefile
+++ b/src/backend/utils/hash/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/hash
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/hash/Makefile,v 1.12 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/hash/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = dynahash.o hashfn.o pg_crc.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
index 15f578f4a84ad7943c135cf2953f8554976c75f2..a27ddb7af6dea2ca1b84f743fbe1a920d150b952 100644 (file)
--- a/src/backend/utils/init/Makefile
+++ b/src/backend/utils/init/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/init
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.21 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.22 2008/02/19 10:30:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = flatfiles.o globals.o miscinit.o postinit.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile
index ccf7164b9e3c83f50af99a3c01d6c85480acf024..62aeff6feba48367f8ee8077002e5855984f5b90 100644 (file)
--- a/src/backend/utils/mb/Makefile
+++ b/src/backend/utils/mb/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mb
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/mb/Makefile,v 1.23 2007/01/20 17:16:13 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/mb/Makefile,v 1.24 2008/02/19 10:30:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,15 +13,8 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS = encnames.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o
-DIRS = conversion_procs
 
-all install installdirs: SUBSYS.o
-
-uninstall distprep:
+include $(top_srcdir)/src/backend/common.mk
 
 clean distclean maintainer-clean:
-       rm -f SUBSYS.o $(OBJS)
-       @for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) $@ $^
+       $(MAKE) -C conversion_procs $@

diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 16f1620e8b6e9b41988b418c3bb67bb92f6034b8..4b6068bbf96185e9616383e383732f119057347d 100644 (file)
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/misc/Makefile,v 1.27 2007/01/20 17:16:14 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/misc/Makefile,v 1.28 2008/02/19 10:30:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,11 +22,7 @@ ifdef krb_srvtab
 override CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
 endif
 
-
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk
 
 # guc-file is compiled as part of guc
 guc.o: $(srcdir)/guc-file.c
@@ -41,5 +37,4 @@ endif
 # Note: guc-file.c is not deleted by 'make clean',
 # since we want to ship it in distribution tarballs.
 clean: 
-       rm -f SUBSYS.o $(OBJS)
        @rm -f lex.yy.c

diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile
index dd56ce7b862a3d5d900b9d85a269187b4ddd60a1..890ab2de16f09c6de2bbc3b2f0077f1d09ce4846 100644 (file)
--- a/src/backend/utils/mmgr/Makefile
+++ b/src/backend/utils/mmgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mmgr
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/mmgr/Makefile,v 1.12 2007/01/20 17:16:14 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/mmgr/Makefile,v 1.13 2008/02/19 10:30:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = aset.o mcxt.o portalmem.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/resowner/Makefile b/src/backend/utils/resowner/Makefile
index 728685e760cc9e62ae1b50c3b4322ab522220582..0a4dac3730709179bb019b91a8e917cfda198f1d 100644 (file)
--- a/src/backend/utils/resowner/Makefile
+++ b/src/backend/utils/resowner/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/resowner
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/resowner/Makefile,v 1.2 2007/01/20 17:16:14 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/resowner/Makefile,v 1.3 2008/02/19 10:30:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = resowner.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile
index 30ad8a18b459404a49155ad7b133d0457a139d10..460f3c1cdaa3874760b62312f17b54c706ffe8cf 100644 (file)
--- a/src/backend/utils/sort/Makefile
+++ b/src/backend/utils/sort/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/sort
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/sort/Makefile,v 1.14 2007/01/20 17:16:14 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/sort/Makefile,v 1.15 2008/02/19 10:30:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = logtape.o tuplesort.o tuplestore.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean: 
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk

diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile
index 9cbe31f8a6beda97d7efe55dc3920d852fc9f11f..5e886d425e017e7fcf3e2c8b9694a0dcd5ea1fda 100644 (file)
--- a/src/backend/utils/time/Makefile
+++ b/src/backend/utils/time/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/time
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/time/Makefile,v 1.12 2007/02/09 03:35:34 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/time/Makefile,v 1.13 2008/02/19 10:30:09 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = combocid.o tqual.o
 
-all: SUBSYS.o
-
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
-clean:
-       rm -f SUBSYS.o $(OBJS)
+include $(top_srcdir)/src/backend/common.mk