Commitc7054a6

committed

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

1 parente2f16cd commitc7054a6Copy full SHA for c7054a6

File tree

+13

-46

lines changed

+13

-46

lines changed

Lines changed: 4 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,37 +13,25 @@`
`13`	`13`	`# be converted to Method 2.`
`14`	`14`	`#`
`15`	`15`	`# IDENTIFICATION`
`16`		`-# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.25 2008/02/1910:30:07 petere Exp $`
	`16`	`+# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.26 2008/02/1915:29:58 petere Exp $`
`17`	`17`	`#`
`18`	`18`	`#-------------------------------------------------------------------------`
`19`	`19`
`20`	`20`	`subdir = src/backend/port`
`21`	`21`	`top_builddir = ../../..`
`22`	`22`	`include$(top_builddir)/src/Makefile.global`
`23`	`23`
`24`		`-OBJS+=dynloader.o pg_sema.o pg_shmem.o`
`25`		`-`
`26`		`-OBJS+=$(TAS)`
	`24`	`+OBJS = dynloader.o pg_sema.o pg_shmem.o$(TAS)`
`27`	`25`
`28`	`26`	`ifeq ($(PORTNAME), darwin)`
`29`		`-OBJS+=darwin/SUBSYS.o`
	`27`	`+SUBDIRS +=darwin`
`30`	`28`	`endif`
`31`	`29`	`ifeq ($(PORTNAME), win32)`
`32`		`-OBJS+=win32/SUBSYS.o`
	`30`	`+SUBDIRS +=win32`
`33`	`31`	`endif`
`34`	`32`
`35`	`33`	`include$(top_srcdir)/src/backend/common.mk`
`36`	`34`
`37`		`-darwin/SUBSYS.o: darwin.dir`
`38`		`-`
`39`		`-darwin.dir:`
`40`		`-$(MAKE) -C darwin all`
`41`		`-`
`42`		`-win32/SUBSYS.o: win32.dir`
`43`		`-`
`44`		`-win32.dir:`
`45`		`-$(MAKE) -C win32 all`
`46`		`-`
`47`	`35`	`tas.o: tas.s`
`48`	`36`	`ifeq ($(PORTNAME), solaris)`
`49`	`37`	`# preprocess assembler file with cpp, used by x86`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for port/darwin`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/backend/port/darwin/Makefile,v 1.5 2007/01/20 17:16:12 petere Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/port/darwin/Makefile,v 1.6 2008/02/19 15:29:58 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`OBJS = system.o`
`16`	`16`
`17`		`-all: SUBSYS.o`
`18`		`-`
`19`		`-SUBSYS.o:$(OBJS)`
`20`		`-$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)`
`21`		`-`
`22`		`-clean:`
`23`		`-rm -f SUBSYS.o$(OBJS)`
	`17`	`+include$(top_srcdir)/src/backend/common.mk`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for port/nextstep`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.10 2007/01/20 17:16:12 petere Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.11 2008/02/19 15:29:58 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`OBJS = port.o`
`16`	`16`
`17`		`-all: SUBSYS.o`
`18`		`-`
`19`		`-SUBSYS.o:$(OBJS)`
`20`		`-$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)`
`21`		`-`
`22`		`-clean:`
`23`		`-rm -f SUBSYS.o$(OBJS)`
	`17`	`+include$(top_srcdir)/src/backend/common.mk`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for backend/port/win32`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/backend/port/win32/Makefile,v 1.11 2007/10/29 12:35:41 mha Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/port/win32/Makefile,v 1.12 2008/02/19 15:29:58 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,10 +14,4 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`OBJS = timer.o socket.o signal.o security.o mingwcompat.o`
`16`	`16`
`17`		`-all: SUBSYS.o`
`18`		`-`
`19`		`-SUBSYS.o:$(OBJS)`
`20`		`-$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)`
`21`		`-`
`22`		`-clean:`
`23`		`-rm -f SUBSYS.o$(OBJS)`
	`17`	`+include$(top_srcdir)/src/backend/common.mk`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for the timezone library`
`5`	`5`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.28 2007/08/25 20:29:25 tgl Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.29 2008/02/19 15:29:58 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -32,15 +32,12 @@ ifneq (,$(with_system_tzdata))`
`32`	`32`	`overrideCPPFLAGS += '-DSYSTEMTZDIR="$(with_system_tzdata)"'`
`33`	`33`	`endif`
`34`	`34`
`35`		`-all: SUBSYS.o`
	`35`	`+include$(top_srcdir)/src/backend/common.mk`
`36`	`36`
`37`	`37`	`ifeq (,$(with_system_tzdata))`
`38`	`38`	`all: submake-libpgport zic`
`39`	`39`	`endif`
`40`	`40`
`41`		`-SUBSYS.o:$(OBJS)`
`42`		`-$(LD)$(LDREL)$(LDOUT) SUBSYS.o$(OBJS)`
`43`		`-`
`44`	`41`	`zic:$(ZICOBJS)`
`45`	`42`	`$(CC)$(CFLAGS)$(ZICOBJS)$(LDFLAGS)$(LIBS) -o$@$(X)`
`46`	`43`
`@@ -60,4 +57,4 @@ endif`
`60`	`57`	`$(MAKE) -C tznames $@`
`61`	`58`
`62`	`59`	`cleandistcleanmaintainer-clean:`
`63`		`-rm -fSUBSYS.ozic$(X)$(OBJS)$(ZICOBJS)`
	`60`	`+rm -f zic$(X)$(ZICOBJS)`

Comments

(0)