summaryrefslogtreecommitdiff
path: root/GNUmakefile.in
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-06-10 18:02:12 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-06-10 18:02:12 +0000
commit6de89c9ab78a557f98dc02dca97795d27a4112d2 (patch)
tree4b1a26308ed5013424b39847f0c7b2aad355e606 /GNUmakefile.in
parent2ae20ef98a94c6a0f77e6358ae756cc02f29e921 (diff)
downloadpostgresql-6de89c9ab78a557f98dc02dca97795d27a4112d2.tar.gz
Moved the intricacies of the perl interface build into its own makefile
that now functions as a wrapper around the MakeMaker stuff. It might even behave sensically when we have separate build dirs. Same for plperl, which of course still doesn't work very well. Made sure that plperl respects the choice of --libdir. Added --with-python to automatically build and install the Python interface. Works similarly to the Perl5 stuff. Moved the burden of the distclean targets lower down into the source tree. Eventually, each make file should have its own. Added automatic remaking of makefiles and configure. Currently only for the top-level because of a bug(?) in Autoconf. Use GNU `missing' to work around missing autoconf and aclocal. Start factoring out macros into their own config/*.m4 files to increase readability and organization.
Diffstat (limited to 'GNUmakefile.in')
-rw-r--r--GNUmakefile.in20
1 files changed, 18 insertions, 2 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3f5929d7e4..f3e33fb278 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
#
# PostgreSQL top level makefile
#
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.2 2000/06/07 23:09:18 petere Exp $
+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.3 2000/06/10 18:01:34 petere Exp $
#
srcdir = @srcdir@
@@ -23,8 +23,24 @@ clean:
$(MAKE) -C src clean
distclean:
- $(MAKE) -C src distclean
+ -$(MAKE) -C src distclean
-rm -f config.cache config.log config.status GNUmakefile
.PHONY: all install clean distclean
+
+
+AUTOCONF = @AUTOCONF@
+ACLOCAL = @ACLOCAL@
+
+GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
+ CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+
+$(top_builddir)/config.status: $(top_srcdir)/configure
+ cd $(top_builddir) && ./config.status --recheck
+
+$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
+ cd $(top_srcdir) && $(AUTOCONF)
+
+$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
+ cd $(top_srcdir) && $(ACLOCAL) -I config