Move

  src/GNUmakefile.in to src/Makefile
and
  src/backend/port/Makefile.in to src/backend/port/Makefile

All configure substitutions are now done in Makefile.global.

1 files changed, 40 insertions, 33 deletions

diff --git a/src/Makefile b/src/Makefile
index 9de7cce1809..f9312cd4b04 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,36 +1,43 @@
-# The PostgreSQL make files exploit features of GNU make that other
-# makes do not have. Because it is a common mistake for users to try
-# to build Postgres with a different make, we have this make file
-# that, as a service, will look for a GNU make and invoke it, or show
-# an error message if none could be found.
+#-------------------------------------------------------------------------
+#
+# Makefile for src
+#
+# Copyright (c) 1994, Regents of the University of California
+#
+# $Header: /cvsroot/pgsql/src/Makefile,v 1.24 2002/03/13 00:05:02 petere Exp $
+#
+#-------------------------------------------------------------------------
 
-# If the user were using GNU make now, this file would not get used
-# because GNU make uses a make file named "GNUmakefile" in preference
-# to "Makefile" if it exists. PostgreSQL is shipped with a
-# "GNUmakefile". If the user hasn't run the configure script yet, the
-# GNUmakefile won't exist yet, so we catch that case as well.
+subdir = src
+top_builddir = ..
+include Makefile.global
 
 
-all check install installdirs install-all-headers installcheck uninstall dep depend clean distclean maintainer-clean:
-	@if [ ! -f GNUmakefile ] ; then \
-	   echo "You need to run the 'configure' program first. See the file"; \
-	   echo "'INSTALL' for installation instructions." ; \
-	   false ; \
-	 fi
-	@IFS=':' ; \
-	 for dir in $$PATH; do \
-	   for prog in gmake gnumake make; do \
-	     if [ -f $$dir/$$prog ] && ( $$dir/$$prog -f /dev/null --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then \
-	       GMAKE=$$dir/$$prog; \
-	       break 2; \
-	     fi; \
-	   done; \
-	 done; \
-	\
-	 if [ x"$${GMAKE+set}" = xset ]; then \
-	   echo "Using GNU make found at $${GMAKE}"; \
-	   $${GMAKE} $@ ; \
-	 else \
-	   echo "You must use GNU make to build PostgreSQL." ; \
-	   false; \
-	 fi
+all install installdirs uninstall dep depend distprep:
+	$(MAKE) -C backend $@
+	$(MAKE) -C include $@
+	$(MAKE) -C interfaces $@
+	$(MAKE) -C bin $@
+	$(MAKE) -C pl $@
+
+install-all-headers:
+	$(MAKE) -C include $@
+
+clean:
+	$(MAKE) -C backend $@
+	$(MAKE) -C include $@
+	$(MAKE) -C interfaces $@
+	$(MAKE) -C bin $@
+	$(MAKE) -C pl $@
+	$(MAKE) -C utils $@
+	$(MAKE) -C test $@
+
+distclean maintainer-clean:
+	-$(MAKE) -C utils $@
+	-$(MAKE) -C backend $@
+	-$(MAKE) -C include $@
+	-$(MAKE) -C interfaces $@
+	-$(MAKE) -C bin $@
+	-$(MAKE) -C pl $@
+	-$(MAKE) -C test $@
+	rm -f Makefile.port Makefile.global