Go back to suppressing foreign_data DETAIL test output.

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 34a8bd15b78d62b320b057b78ff80778325f76c0..f4e31a7c5f1f2ab114a77400c06f720c909a7838 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,46 +1,53 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.54 2009/10/29 21:57:17 petere Exp $
+# GNUmakefile.in
 #
 
 subdir =
 top_builddir = .
 include $(top_builddir)/src/Makefile.global
 
+$(call recurse,all install,src config)
+
 all:
+       +@echo "All of PostgreSQL successfully made. Ready to install."
+
+docs:
        $(MAKE) -C doc all
-       $(MAKE) -C src all
-       $(MAKE) -C config all
-       @echo "All of PostgreSQL successfully made. Ready to install."
+
+$(call recurse,world,doc src config contrib,all)
+world:
+       +@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 doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       @echo "PostgreSQL installation complete."
+       +@echo "PostgreSQL installation complete."
 
-installdirs uninstall coverage:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
+install-docs:
+       $(MAKE) -C doc install
 
-distprep:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       $(MAKE) -C contrib $@
+$(call recurse,install-world,doc src config contrib,install)
+install-world:
+       +@echo "PostgreSQL, contrib, and documentation installation complete."
+
+# build src/ before contrib/
+install-world-contrib-recurse: install-world-src-recurse
+
+$(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/
 
@@ -51,14 +58,19 @@ 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 check-tests installcheck installcheck-parallel installcheck-tests: CHECKPREP_TOP=src/test/regress
+check check-tests installcheck installcheck-parallel installcheck-tests: submake-generated-headers
+       $(MAKE) -C src/test/regress $@
 
-check: all
+$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)
+$(call recurse,checkprep,  src/test src/pl src/interfaces/ecpg contrib src/bin)
 
-check installcheck installcheck-parallel:
-       $(MAKE) -C src/test $@
+$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib src/bin,installcheck)
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
        ./config.status $@
@@ -68,14 +80,15 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 
 distdir        = postgresql-$(VERSION)
 dummy  = =install=
-garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-dist: $(distdir).tar.gz 
+dist: $(distdir).tar.gz $(distdir).tar.bz2
        rm -rf $(distdir)
 
 $(distdir).tar: distdir
        $(TAR) chf $@ $(distdir)
 
+.INTERMEDIATE: $(distdir).tar
+
 distdir-location:
        @echo $(distdir)
 
@@ -91,17 +104,15 @@ 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: $(distdir).tar.gz
+distcheck: dist
        rm -rf $(dummy)
        mkdir $(dummy)
-       $(GZIP) -d -c $< | $(TAR) xf -
+       $(GZIP) -d -c $(distdir).tar.gz | $(TAR) xf -
        install_prefix=`cd $(dummy) && pwd`; \
        cd $(distdir) \
        && ./configure --prefix="$$install_prefix"
@@ -117,5 +128,4 @@ distcheck: $(distdir).tar.gz
        rm -rf $(distdir) $(dummy)
        @echo "Distribution integrity checks out."
 
-.PHONY: dist distdir distcheck
-unexport split-dist
+.PHONY: dist distdir distcheck docs install-docs world check-world install-world installcheck-world