Fix pg_server_to_client, that was broken in the previous commit.

[postgresql] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index c1996cc1b4a9f7bba6b2a3cbdc040393e57e71e1..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.31 2004/04/26 00:48:38 momjian Exp $
+# src/Makefile
 #
 #-------------------------------------------------------------------------
 
@@ -12,40 +12,64 @@ 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 dep depend distprep:
-       $(MAKE) -C port $@
-       $(MAKE) -C backend $@
-       $(MAKE) -C backend/utils/mb/conversion_procs $@
-       $(MAKE) -C include $@
-       $(MAKE) -C interfaces $@
-       $(MAKE) -C bin $@
-       $(MAKE) -C pl $@
+# There are too many interdependencies between the subdirectories, so
+# don't attempt parallel make here.
+.NOTPARALLEL:
+
+$(recurse)
+
+install: install-local
+
+install-local: installdirs-local
+       $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
+       $(INSTALL_DATA) Makefile.port '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.port'
+       $(INSTALL_DATA) $(srcdir)/Makefile.shlib '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.shlib'
+       $(INSTALL_DATA) $(srcdir)/nls-global.mk '$(DESTDIR)$(pgxsdir)/$(subdir)/nls-global.mk'
+
+installdirs: installdirs-local
+
+installdirs-local:
+       $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)'
+
+uninstall: uninstall-local
 
-install-all-headers:
-       $(MAKE) -C include $@
+uninstall-local:
+       rm -f $(addprefix '$(DESTDIR)$(pgxsdir)/$(subdir)'/, Makefile.global Makefile.port Makefile.shlib nls-global.mk)
 
 clean:
-       $(MAKE) -C port $@
+       $(MAKE) -C test $@
+       $(MAKE) -C tutorial NO_PGXS=1 $@
+       $(MAKE) -C test/thread $@
+
+distclean maintainer-clean:
+       $(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 include $@
+       $(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 $@
-       $(MAKE) -C test $@
-       $(MAKE) -C tutorial $@
-       $(MAKE) -C utils $@
-       $(MAKE) -C tools/thread $@
 
-distclean maintainer-clean:
-       -$(MAKE) -C port $@
-       -$(MAKE) -C backend $@
-       -$(MAKE) -C include $@
-       -$(MAKE) -C interfaces $@
-       -$(MAKE) -C bin $@
-       -$(MAKE) -C pl $@
-       -$(MAKE) -C test $@
-       -$(MAKE) -C tutorial $@
-       -$(MAKE) -C utils $@
-       -$(MAKE) -C tools/thread $@
-       rm -f Makefile.port Makefile.global
+
+.PHONY: install-local installdirs-local uninstall-local