More refactoring, so that the SUBSYS.o rules are now all in one place.

diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 48d0d6c774130c73a920931569d790b7717b84c5..47152940d8bbd13539e07740ee51e841f5a59a99 100644 (file)
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -21,29 +21,17 @@ subdir = src/backend/port
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS+=dynloader.o pg_sema.o pg_shmem.o
-
-OBJS+=$(TAS)
+OBJS = dynloader.o pg_sema.o pg_shmem.o $(TAS)
 
 ifeq ($(PORTNAME), darwin)
-OBJS+=darwin/SUBSYS.o
+SUBDIRS += darwin
 endif
 ifeq ($(PORTNAME), win32)
-OBJS+=win32/SUBSYS.o
+SUBDIRS += win32
 endif
 
 include $(top_srcdir)/src/backend/common.mk
 
-darwin/SUBSYS.o: darwin.dir
-
-darwin.dir:
-       $(MAKE) -C darwin all
-
-win32/SUBSYS.o: win32.dir
-
-win32.dir:
-       $(MAKE) -C win32 all
-
 tas.o: tas.s
 ifeq ($(PORTNAME), solaris)
 # preprocess assembler file with cpp, used by x86

diff --git a/src/backend/port/darwin/Makefile b/src/backend/port/darwin/Makefile
index 033d03bd864ba7ca2cec005558ae879749485208..8f7437107a7a69786d72147d7917bfb9ed4b1961 100644 (file)
--- a/src/backend/port/darwin/Makefile
+++ b/src/backend/port/darwin/Makefile
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = system.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/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile
index ee28486c36f5d26155f8409b361ec4b9e20db326..58f70603efaa596f1fc693126e8c93306528f479 100644 (file)
--- a/src/backend/port/nextstep/Makefile
+++ b/src/backend/port/nextstep/Makefile
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = port.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/port/win32/Makefile b/src/backend/port/win32/Makefile
index f7400157fb374c330f14ff9458c2b48cf8218af1..58920578508e884860dad0a42ba710bf72233a78 100644 (file)
--- a/src/backend/port/win32/Makefile
+++ b/src/backend/port/win32/Makefile
@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = timer.o socket.o signal.o security.o mingwcompat.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/timezone/Makefile b/src/timezone/Makefile
index ce02fa7b78860b37a48c7797259bbf65067dfa48..271d9e9617ebad9385979ce28c72d489152bc1f0 100644 (file)
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -32,15 +32,12 @@ ifneq (,$(with_system_tzdata))
 override CPPFLAGS += '-DSYSTEMTZDIR="$(with_system_tzdata)"'
 endif
 
-all: SUBSYS.o
+include $(top_srcdir)/src/backend/common.mk
 
 ifeq (,$(with_system_tzdata))
 all: submake-libpgport zic
 endif
 
-SUBSYS.o: $(OBJS)
-       $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-
 zic: $(ZICOBJS)
        $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
@@ -60,4 +57,4 @@ endif
        $(MAKE) -C tznames $@
 
 clean distclean maintainer-clean:
-       rm -f SUBSYS.o zic$(X) $(OBJS) $(ZICOBJS)
+       rm -f zic$(X) $(ZICOBJS)