diff options
author | Peter Eisentraut <peter_e@gmx.net> | 2010-11-12 22:15:16 +0200 |
---|---|---|
committer | Peter Eisentraut <peter_e@gmx.net> | 2010-11-12 22:15:16 +0200 |
commit | 19e231bbdaef792dce22100012b504e2fb72f971 (patch) | |
tree | 011823e7b1b882972eaff7c4f3a6b18571030e4a /src/backend/utils | |
parent | d6754f67b08ad6a05640fc5d9d97c6f225512ea0 (diff) | |
download | postgresql-19e231bbdaef792dce22100012b504e2fb72f971.tar.gz postgresql-19e231bbdaef792dce22100012b504e2fb72f971.zip |
Improved parallel make support
Replace for loops in makefiles with proper dependencies. Parallel
make can now span across directories. Also, make -k and make -q work
properly.
GNU make 3.80 or newer is now required.
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/mb/conversion_procs/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
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 |