Skip to content

Commit 44d1abe

Browse files
committed
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.
1 parent 4786a80 commit 44d1abe

35 files changed

+741
-801
lines changed

GNUmakefile.in

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.4 2000/06/11 18:43:52 tgl Exp $
4+
# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.5 2000/06/14 18:17:24 petere Exp $
55
#
66

77
srcdir = @srcdir@
@@ -30,26 +30,27 @@ distclean:
3030
.PHONY: all install clean distclean
3131

3232

33-
AUTOCONF = @AUTOCONF@
34-
ACLOCAL = @ACLOCAL@
35-
3633
GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
3734
CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
3835

39-
# This rule does not work --- what if config.status doesn't exist?
36+
$(top_builddir)/config.status: $(top_srcdir)/configure
37+
cd $(top_builddir) && ./config.status --recheck
38+
4039

41-
# $(top_builddir)/config.status: $(top_srcdir)/configure
42-
# cd $(top_builddir) && ./config.status --recheck
40+
# These dependencies are risky because both the target and the sources
41+
# are in CVS and CVS doesn't preserve timestamps, thus leading to
42+
# unnecessary reruns of these rules.
4343

44-
# These dependencies are evil and dangerous, because they can cause make
45-
# to re-run autoconf and then re-run configure due to configure not
46-
# having a newer timestamp than configure.in after a CVS pull. Same
47-
# problem for aclocal timestamp skew. This solution is considerably
48-
# worse than the problem it was intended to solve.
49-
# Do not put it back or I will take it right out again --- tgl
44+
AUTOCONF = autoconf
5045

51-
# $(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
52-
# cd $(top_srcdir) && $(AUTOCONF)
46+
# Only use this rule if you actually said `make configure'.
47+
ifeq ($(MAKECMDGOALS),configure)
48+
$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
49+
cd $(top_srcdir) && $(AUTOCONF)
50+
endif
5351

54-
# $(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
55-
# cd $(top_srcdir) && $(ACLOCAL) -I config
52+
# This one we can leave unprotected because by default nothing depends
53+
# on aclocal.m4. This rule is only invoked if you say `make
54+
# aclocal.m4' or `make configure'.
55+
$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
56+
cat $^ > $@

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy