Add missing file to GETTEXT_FILES

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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f7bcc67..79b0da4 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,54 +1,57 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.46 2007/02/09 15:55:57 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."
 
-install:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       @echo "PostgreSQL installation complete."
+$(call recurse,world,doc src config contrib,all)
+world:
+       +@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
 
-installdirs uninstall:
+html man:
        $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
 
-distprep:
-       $(MAKE) -C doc $@
-       $(MAKE) -C src $@
-       $(MAKE) -C config $@
-       $(MAKE) -C contrib $@
+install:
+       +@echo "PostgreSQL installation complete."
+
+install-docs:
+       $(MAKE) -C doc install
+
+$(call recurse,install-world,doc src config contrib,install)
+install-world:
+       +@echo "PostgreSQL, contrib, and documentation installation complete."
+
+$(call recurse,installdirs uninstall coverage,doc src config)
+
+$(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/
 
 # Important: distclean `src' last, otherwise Makefile.global
 # will be gone too soon.
 distclean maintainer-clean:
-       -$(MAKE) -C doc $@
-       -$(MAKE) -C contrib $@
-       -$(MAKE) -C config $@
-       -$(MAKE) -C src $@
-       -rm -f config.cache config.log config.status GNUmakefile
+       $(MAKE) -C doc $@
+       $(MAKE) -C contrib $@
+       $(MAKE) -C config $@
+       $(MAKE) -C src $@
+       rm -f config.cache config.log config.status GNUmakefile
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
@@ -57,6 +60,12 @@ check: all
 check installcheck installcheck-parallel:
        $(MAKE) -C src/test $@
 
+$(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 $@
 
@@ -67,38 +76,20 @@ distdir     = postgresql-$(VERSION)
 dummy  = =install=
 garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-dist: $(distdir).tar.gz 
-ifeq ($(split-dist), yes)
-dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz 
-endif
-dist:
-       -rm -rf $(distdir)
+dist: $(distdir).tar.gz $(distdir).tar.bz2
+       rm -rf $(distdir)
 
 $(distdir).tar: distdir
        $(TAR) chf $@ $(distdir)
 
-opt_files = \
-       src/tools src/tutorial \
-       $(addprefix src/pl/, plperl plpython tcl)
-
-docs_files = doc/postgres.tar.gz doc/src doc/TODO.detail
-
-postgresql-base-$(VERSION).tar: distdir
-       $(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \
-         -f $@ $(distdir)
-
-postgresql-docs-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(addprefix $(distdir)/, $(docs_files))
-
-postgresql-opt-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(addprefix $(distdir)/, $(opt_files))
+.INTERMEDIATE: $(distdir).tar
 
-postgresql-test-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(distdir)/src/test
+distdir-location:
+       @echo $(distdir)
 
 distdir:
-       -rm -rf $(distdir)* $(dummy)
-       for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+       rm -rf $(distdir)* $(dummy)
+       for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
          file=`expr X$$x : 'X\./\(.*\)'`; \
          if test -d "$(top_srcdir)/$$file" ; then \
            mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
@@ -113,12 +104,12 @@ 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: $(distdir).tar.gz
-       -rm -rf $(dummy)
+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"
@@ -131,8 +122,7 @@ distcheck: $(distdir).tar.gz
        $(MAKE) -C $(distdir) dist
 # Room for improvement: Check here whether this distribution tarball
 # is sufficiently similar to the original one.
-       -rm -rf $(distdir) $(dummy)
+       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