diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-06-14 18:18:01 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-06-14 18:18:01 +0000 |
| commit | 44d1abebb48d678ac1b75f6556c68c9634cb235b (patch) | |
| tree | fe1efd24fb2fa1565bb69533583bda1e94f13a08 /GNUmakefile.in | |
| parent | 4786a808d9f58746ebb77bf78a6ae2d0854cd6b9 (diff) | |
| download | postgresql-44d1abebb48d678ac1b75f6556c68c9634cb235b.tar.gz | |
Big warnings cleanup for Solaris/GCC. Down to about 40 now, but
we'll get there one day.
Use `cat' to create aclocal.m4, not `aclocal'. Some people don't
have automake installed.
Only run the autoconf rule in the top-level GNUmakefile if the
invoker specified `make configure', don't run it automatically
because of CVS timestamp skew.
Diffstat (limited to 'GNUmakefile.in')
| -rw-r--r-- | GNUmakefile.in | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 7c38733326..e3e26d483c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,7 +1,7 @@ # # PostgreSQL top level makefile # -# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.4 2000/06/11 18:43:52 tgl Exp $ +# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.5 2000/06/14 18:17:24 petere Exp $ # srcdir = @srcdir@ @@ -30,26 +30,27 @@ distclean: .PHONY: all install clean distclean -AUTOCONF = @AUTOCONF@ -ACLOCAL = @ACLOCAL@ - GNUmakefile: GNUmakefile.in $(top_builddir)/config.status CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -# This rule does not work --- what if config.status doesn't exist? +$(top_builddir)/config.status: $(top_srcdir)/configure + cd $(top_builddir) && ./config.status --recheck + -# $(top_builddir)/config.status: $(top_srcdir)/configure -# cd $(top_builddir) && ./config.status --recheck +# 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. -# These dependencies are evil and dangerous, because they can cause make -# to re-run autoconf and then re-run configure due to configure not -# having a newer timestamp than configure.in after a CVS pull. Same -# problem for aclocal timestamp skew. This solution is considerably -# worse than the problem it was intended to solve. -# Do not put it back or I will take it right out again --- tgl +AUTOCONF = autoconf -# $(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4 -# cd $(top_srcdir) && $(AUTOCONF) +# 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 -# $(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4) -# cd $(top_srcdir) && $(ACLOCAL) -I config +# 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 $^ > $@ |