diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/Makefile | 4 | ||||
| -rw-r--r-- | src/backend/common.mk | 6 | ||||
| -rw-r--r-- | src/backend/replication/libpqwalreceiver/Makefile | 3 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/Makefile | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index bed086c6f79..9a0f2e21e56 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -122,7 +122,9 @@ submake-schemapg: .PHONY: submake-schemapg -catalog/schemapg.h: submake-schemapg +catalog/schemapg.h: | submake-schemapg + +$(top_builddir)/src/port/libpgport_srv.a: | submake-libpgport # The postgres.o target is needed by the rule in Makefile.global that diff --git a/src/backend/common.mk b/src/backend/common.mk index 5ba8822b4f7..4e0a5da3334 100644 --- a/src/backend/common.mk +++ b/src/backend/common.mk @@ -34,15 +34,13 @@ objfiles.txt: Makefile $(SUBDIROBJS) $(OBJS) expand_subsys = $(foreach file,$(1),$(if $(filter %/objfiles.txt,$(file)),$(patsubst ../../src/backend/%,%,$(addprefix $(top_builddir)/,$(shell cat $(file)))),$(file))) # Parallel make trickery -$(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ; +$(SUBDIROBJS): | $(SUBDIRS:%=%-recursive) ; .PHONY: $(SUBDIRS:%=%-recursive) $(SUBDIRS:%=%-recursive): $(MAKE) -C $(subst -recursive,,$@) all +$(call recurse,clean) clean: clean-local clean-local: -ifdef SUBDIRS - for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean || exit; done -endif rm -f $(subsysfilename) $(OBJS) diff --git a/src/backend/replication/libpqwalreceiver/Makefile b/src/backend/replication/libpqwalreceiver/Makefile index c310b3ba48f..774adaa24d4 100644 --- a/src/backend/replication/libpqwalreceiver/Makefile +++ b/src/backend/replication/libpqwalreceiver/Makefile @@ -16,9 +16,10 @@ override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) OBJS = libpqwalreceiver.o SHLIB_LINK = $(libpq) +SHLIB_PREREQS = submake-libpq NAME = libpqwalreceiver -all: submake-libpq all-shared-lib +all: all-shared-lib include $(top_srcdir)/src/Makefile.shlib diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 3cdc45708e3..0848d963356 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -26,6 +26,8 @@ SUBDIRS = \ utf8_and_sjis utf8_and_win utf8_and_uhc \ utf8_and_euc2004 utf8_and_sjis2004 euc2004_sjis2004 +$(recurse) + # conversion_name source_encoding destination_encoding function object CONVERSIONS = \ ascii_to_mic SQL_ASCII MULE_INTERNAL ascii_to_mic ascii_and_mic \ @@ -162,7 +164,6 @@ CONVERSIONS = \ shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc2004_sjis2004 all: $(SQLSCRIPT) - @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done $(SQLSCRIPT): Makefile ifeq ($(enable_shared), yes) @@ -205,15 +206,12 @@ $(REGRESSION_SCRIPT): Makefile install: $(SQLSCRIPT) installdirs $(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)' - @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done installdirs: $(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(pkglibdir)' uninstall: rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)' - @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done clean distclean maintainer-clean: rm -f $(SQLSCRIPT) - @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done |