Add missing file to GETTEXT_FILES

[pg-rex/syncrep.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 86623a3..79b0da4 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,64 +1,46 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.58 2010/03/30 00:10:46 petere Exp $
+# GNUmakefile.in
 #
 
 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."
 
 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 $@
+$(call recurse,installdirs uninstall coverage,doc src config)
 
-distprep:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       $(MAKE) -C contrib $@
+$(call recurse,distprep,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 $@
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
@@ -78,11 +60,11 @@ check: all
 check installcheck installcheck-parallel:
        $(MAKE) -C src/test $@
 
-installcheck-world:
-       $(MAKE) -C src/test installcheck
-       $(MAKE) -C src/pl installcheck
-       $(MAKE) -C src/interfaces/ecpg installcheck
-       $(MAKE) -C contrib installcheck
+$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib,check)
+
+$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib,installcheck)
+
+$(call recurse,maintainer-check,doc src config contrib)
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
        ./config.status $@
@@ -122,7 +104,7 @@ distdir:
        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 +125,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