From 553eb0e8f0274f5dec428c103b8aa7c0f25ea7ec Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 19 Feb 2008 15:29:58 +0000
Subject: [PATCH] More refactoring, so that the SUBSYS.o rules are now all in
 one place.

---
 src/backend/port/Makefile          | 18 +++---------------
 src/backend/port/darwin/Makefile   |  8 +-------
 src/backend/port/nextstep/Makefile |  8 +-------
 src/backend/port/win32/Makefile    |  8 +-------
 src/timezone/Makefile              |  7 ++-----
 5 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 48d0d6c774..47152940d8 100644
--- 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 033d03bd86..8f7437107a 100644
--- 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 ee28486c36..58f70603ef 100644
--- 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 f7400157fb..5892057850 100644
--- 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 ce02fa7b78..271d9e9617 100644
--- 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)
-- 
2.39.5