Fix searchpath and module location for pg_rewind and ssl TAP tests

[postgresql] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 0aad44c0baccc5a92f20d8b9f87eada1beeb95dd..bcdbd9588aa437ce3a41123e71be07154653645b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,7 @@ top_builddir = ..
 include Makefile.global
 
 SUBDIRS = \
+       common \
        port \
        timezone \
        backend \
@@ -21,26 +22,23 @@ SUBDIRS = \
        include \
        interfaces \
        backend/replication/libpqwalreceiver \
+       backend/replication/pgoutput \
+       fe_utils \
        bin \
        pl \
        makefiles \
-       test/regress
+       test/regress \
+       test/isolation \
+       test/perl
+
+ifeq ($(with_llvm), yes)
+SUBDIRS += backend/jit/llvm
+endif
 
 # There are too many interdependencies between the subdirectories, so
 # don't attempt parallel make here.
 .NOTPARALLEL:
 
-# generate errcodes.h before recursing in the subdirectories
-$(SUBDIRS:%=all-%-recurse): $(top_builddir)/src/include/utils/errcodes.h
-
-backend/utils/errcodes.h: backend/utils/generate-errcodes.pl $(top_srcdir)/src/backend/utils/errcodes.txt
-       $(MAKE) -C backend/utils errcodes.h
-
-$(top_builddir)/src/include/utils/errcodes.h: backend/utils/errcodes.h
-       prereqdir=`cd $(dir $<) >/dev/null && pwd` && \
-         cd $(dir $@) && rm -f $(notdir $@) && \
-         $(LN_S) "$$prereqdir/$(notdir $<)" .
-
 $(recurse)
 
 install: install-local
@@ -61,26 +59,21 @@ uninstall: uninstall-local
 uninstall-local:
        rm -f $(addprefix '$(DESTDIR)$(pgxsdir)/$(subdir)'/, Makefile.global Makefile.port Makefile.shlib nls-global.mk)
 
+distprep:
+       $(MAKE) -C test/isolation $@
+
 clean:
        $(MAKE) -C test $@
        $(MAKE) -C tutorial NO_PGXS=1 $@
+       $(MAKE) -C test/isolation $@
        $(MAKE) -C test/thread $@
 
 distclean maintainer-clean:
        $(MAKE) -C test $@
        $(MAKE) -C tutorial NO_PGXS=1 $@
+       $(MAKE) -C test/isolation $@
        $(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