Re-fix wrong costing of Sort under Gather Merge.

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8355b9be93cd68a726572c02a9cf1ffae32097c5..dc76a5d11dd88e4c921964c840517a6d93dde3b9 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -8,57 +8,46 @@ subdir =
 top_builddir = .
 include $(top_builddir)/src/Makefile.global
 
+$(call recurse,all install,src config)
+
 all:
-       $(MAKE) -C src all
-       $(MAKE) -C config all
-       @echo "All of PostgreSQL successfully made. Ready to install."
+       +@echo "All of PostgreSQL successfully made. Ready to install."
 
 docs:
        $(MAKE) -C doc all
 
+$(call recurse,world,doc src config contrib,all)
 world:
-       $(MAKE) -C doc all
-       $(MAKE) -C src all
-       $(MAKE) -C config all
-       $(MAKE) -C contrib all
-       @echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
+       +@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
+
+# build src/ before contrib/
+world-contrib-recurse: world-src-recurse
 
 html man:
        $(MAKE) -C doc $@
 
 install:
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       @echo "PostgreSQL installation complete."
+       +@echo "PostgreSQL installation complete."
 
 install-docs:
        $(MAKE) -C doc install
 
+$(call recurse,install-world,doc src config contrib,install)
 install-world:
-       $(MAKE) -C doc install
-       $(MAKE) -C src install
-       $(MAKE) -C config install
-       $(MAKE) -C contrib install
-       @echo "PostgreSQL, contrib, and documentation installation complete."
+       +@echo "PostgreSQL, contrib, and documentation installation complete."
 
-installdirs uninstall coverage:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
+# build src/ before contrib/
+install-world-contrib-recurse: install-world-src-recurse
 
-distprep:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       $(MAKE) -C contrib $@
+$(call recurse,installdirs uninstall init-po update-po,doc src config)
+
+$(call recurse,distprep coverage,doc src config contrib)
 
 # clean, distclean, etc should apply to contrib too, even though
 # it's not built by default
+$(call recurse,clean,doc contrib src config)
 clean:
-       $(MAKE) -C doc $@
-       $(MAKE) -C contrib $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
+       rm -rf tmp_install/
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
@@ -69,20 +58,17 @@ distclean maintainer-clean:
        $(MAKE) -C contrib $@
        $(MAKE) -C config $@
        $(MAKE) -C src $@
-       rm -f config.cache config.log config.status GNUmakefile
+       rm -rf tmp_install/
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
+       rm -f config.cache config.log config.status GNUmakefile
 
-check: all
+check check-tests installcheck installcheck-parallel installcheck-tests:
+       $(MAKE) -C src/test/regress $@
 
-check installcheck installcheck-parallel:
-       $(MAKE) -C src/test $@
+$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)
 
-installcheck-world:
-       $(MAKE) -C src/test installcheck
-       $(MAKE) -C src/pl installcheck
-       $(MAKE) -C src/interfaces/ecpg installcheck
-       $(MAKE) -C contrib installcheck
+$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib src/bin,installcheck)
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
        ./config.status $@
@@ -117,12 +103,10 @@ distdir:
          fi || exit; \
        done
        $(MAKE) -C $(distdir) distprep
-       $(MAKE) -C $(distdir)/doc/src/sgml/ HISTORY INSTALL regress_README
-       cp $(distdir)/doc/src/sgml/HISTORY $(distdir)/
+       $(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
        cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
-       cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README
        $(MAKE) -C $(distdir) distclean
-       rm -f $(distdir)/README.CVS
+       rm -f $(distdir)/README.git
 
 distcheck: dist
        rm -rf $(dummy)
@@ -143,4 +127,4 @@ distcheck: dist
        rm -rf $(distdir) $(dummy)
        @echo "Distribution integrity checks out."
 
-.PHONY: dist distdir distcheck docs install-docs
+.PHONY: dist distdir distcheck docs install-docs world check-world install-world installcheck-world