X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=GNUmakefile.in;h=dc76a5d11dd88e4c921964c840517a6d93dde3b9;hb=9aef173163ae68c6b241e4c9bbb375c6baa71c60;hp=b347831317cde005e26d1e340dbae4380f12df43;hpb=81ddc46c8c795abf582b3b87e0dd1d639673399c;p=postgresql

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b347831317..dc76a5d11d 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,99 +1,99 @@
 #
 # PostgreSQL top level makefile
 #
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.10 2000/08/20 15:55:15 petere Exp $
+# GNUmakefile.in
 #
 
 subdir =
 top_builddir = .
-include src/Makefile.global
+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
-	@echo "All of PostgreSQL successfully made. Ready to install."
 
-install:
-	$(MAKE) -C doc install
-	$(MAKE) -C src install
-	@cat $(srcdir)/register.txt
+$(call recurse,world,doc src config contrib,all)
+world:
+	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
 
-installdirs uninstall clean distprep:
-	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
+# build src/ before contrib/
+world-contrib-recurse: world-src-recurse
 
-# Important: distclean `doc' before `src', otherwise Makefile.global
-# will be gone too soon.
-distclean maintainer-clean:
-	-$(MAKE) -C doc $@
-	-$(MAKE) -C src $@
-	-rm -f config.cache config.log config.status GNUmakefile
+html man:
+	$(MAKE) -C doc $@
 
+install:
+	+@echo "PostgreSQL installation complete."
 
-GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+install-docs:
+	$(MAKE) -C doc install
 
+$(call recurse,install-world,doc src config contrib,install)
+install-world:
+	+@echo "PostgreSQL, contrib, and documentation installation complete."
 
-# These dependencies are risky because both the target and the sources
-# are in CVS and CVS doesn't preserve timestamps, thus leading to
-# unnecessary reruns of these rules.
+# build src/ before contrib/
+install-world-contrib-recurse: install-world-src-recurse
 
-AUTOCONF = autoconf
+$(call recurse,installdirs uninstall init-po update-po,doc src config)
 
-# Only use this rule if you actually said `make configure'.
-ifeq ($(MAKECMDGOALS),configure)
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
-	cd $(top_srcdir) && $(AUTOCONF)
-endif
+$(call recurse,distprep coverage,doc src config contrib)
 
-# This one we can leave unprotected because by default nothing depends
-# on aclocal.m4. This rule is only invoked if you say `make
-# aclocal.m4' or `make configure'.
-$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
-	cat $^ > $@
+# clean, distclean, etc should apply to contrib too, even though
+# it's not built by default
+$(call recurse,clean,doc contrib src config)
+clean:
+	rm -rf tmp_install/
+# 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 -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:
+	$(MAKE) -C src/test/regress $@
 
-distdir	:= postgresql-$(VERSION)
-dummy	:= =install=
-garbage := =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
+$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)
 
-GZIP	:= gzip
-BZIP2	:= bzip2
+$(call recurse,installcheck-world,src/test src/pl src/interfaces/ecpg contrib src/bin,installcheck)
 
-dist: $(distdir).tar.gz
-ifeq ($(split-dist), yes)
-dist: $(distdir).base.tar.gz $(distdir).docs.tar.gz $(distdir).support.tar.gz $(distdir).test.tar.gz
-endif
-dist:
-	-rm -rf $(distdir)
+GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
+	./config.status $@
 
-$(distdir).tar: distdir
-	$(TAR) chf $@ $(distdir)
 
-$(distdir).base.tar: distdir
-	$(TAR) -c $(addprefix --exclude $(distdir)/, doc src/test src/interfaces src/bin) \
-	  -f $@ $(distdir)
+##########################################################################
 
-$(distdir).docs.tar: distdir
-	$(TAR) cf $@ $(distdir)/doc
+distdir	= postgresql-$(VERSION)
+dummy	= =install=
+garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-$(distdir).support.tar: distdir
-	$(TAR) cf $@ $(distdir)/src/interfaces $(distdir)/src/bin
+dist: $(distdir).tar.gz $(distdir).tar.bz2
+	rm -rf $(distdir)
 
-$(distdir).test.tar: distdir
-	$(TAR) cf $@ $(distdir)/src/test
+$(distdir).tar: distdir
+	$(TAR) chf $@ $(distdir)
 
-%.gz: %
-	$(GZIP) -f --best $<
+.INTERMEDIATE: $(distdir).tar
 
-%.bz2: %
-	$(BZIP2) -f $<
+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";	\
@@ -103,12 +103,15 @@ distdir:
 	  fi || exit; \
 	done
 	$(MAKE) -C $(distdir) distprep
+	$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
+	cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
 	$(MAKE) -C $(distdir) distclean
+	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"
@@ -117,11 +120,11 @@ distcheck: $(distdir).tar.gz
 	$(MAKE) -C $(distdir) install
 	$(MAKE) -C $(distdir) uninstall
 	@echo "checking whether \`$(MAKE) uninstall' works"
-	test `find $(dummy) -not -type d | wc -l` -eq 0
+	test `find $(dummy) ! -type d | wc -l` -eq 0
 	$(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
+.PHONY: dist distdir distcheck docs install-docs world check-world install-world installcheck-world