Fix pg_server_to_client, that was broken in the previous commit.

[postgresql] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 8d66bf62cacd4631f2e074c2f774637703c8753a..4469d2cdf2c004e178d9b9d3c268e913224c4a93 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/Makefile,v 1.42 2007/08/21 01:11:12 tgl Exp $
+# src/Makefile
 #
 #-------------------------------------------------------------------------
 
@@ -12,19 +12,25 @@ subdir = src
 top_builddir = ..
 include Makefile.global
 
+SUBDIRS = \
+       port \
+       timezone \
+       backend \
+       backend/utils/mb/conversion_procs \
+       backend/snowball \
+       include \
+       interfaces \
+       backend/replication/libpqwalreceiver \
+       bin \
+       pl \
+       makefiles \
+       test/regress
 
-all install installdirs uninstall distprep:
-       $(MAKE) -C port $@
-       $(MAKE) -C timezone $@
-       $(MAKE) -C backend $@
-       $(MAKE) -C backend/utils/mb/conversion_procs $@
-       $(MAKE) -C backend/snowball $@
-       $(MAKE) -C include $@
-       $(MAKE) -C interfaces $@
-       $(MAKE) -C bin $@
-       $(MAKE) -C pl $@
-       $(MAKE) -C makefiles $@
-       $(MAKE) -C test/regress $@
+# There are too many interdependencies between the subdirectories, so
+# don't attempt parallel make here.
+.NOTPARALLEL:
+
+$(recurse)
 
 install: install-local
 
@@ -37,7 +43,7 @@ install-local: installdirs-local
 installdirs: installdirs-local
 
 installdirs-local:
-       $(mkinstalldirs) '$(DESTDIR)$(pgxsdir)/$(subdir)'
+       $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)'
 
 uninstall: uninstall-local
 
@@ -45,33 +51,25 @@ uninstall-local:
        rm -f $(addprefix '$(DESTDIR)$(pgxsdir)/$(subdir)'/, Makefile.global Makefile.port Makefile.shlib nls-global.mk)
 
 clean:
-       $(MAKE) -C port $@
-       $(MAKE) -C timezone $@
-       $(MAKE) -C backend $@
-       $(MAKE) -C backend/snowball $@
-       $(MAKE) -C include $@
-       $(MAKE) -C interfaces $@
-       $(MAKE) -C bin $@
-       $(MAKE) -C pl $@
-       $(MAKE) -C makefiles $@
        $(MAKE) -C test $@
        $(MAKE) -C tutorial NO_PGXS=1 $@
        $(MAKE) -C test/thread $@
 
 distclean maintainer-clean:
-       -$(MAKE) -C port $@
-       -$(MAKE) -C timezone $@
-       -$(MAKE) -C backend $@
-       -$(MAKE) -C backend/snowball $@
-       -$(MAKE) -C include $@
-       -$(MAKE) -C interfaces $@
-       -$(MAKE) -C bin $@
-       -$(MAKE) -C pl $@
-       -$(MAKE) -C makefiles $@
-       -$(MAKE) -C test $@
-       -$(MAKE) -C tutorial NO_PGXS=1 $@
-       -$(MAKE) -C test/thread $@
+       $(MAKE) -C test $@
+       $(MAKE) -C tutorial NO_PGXS=1 $@
+       $(MAKE) -C test/thread $@
        rm -f Makefile.port Makefile.global
 
+coverage:
+       $(MAKE) -C timezone $@
+       $(MAKE) -C backend $@
+       $(MAKE) -C backend/utils/mb/conversion_procs $@
+       $(MAKE) -C backend/snowball $@
+       $(MAKE) -C interfaces $@
+       $(MAKE) -C backend/replication/libpqwalreceiver $@
+       $(MAKE) -C bin $@
+       $(MAKE) -C pl $@
+
 
 .PHONY: install-local installdirs-local uninstall-local