VPATH fix for non-ORCA Makefiles.

This fixes up quite a few confusion around the use of top_srcdir vs
top_builddir. Amusingly most of this is uncovered by running merely a
"make clean" on a VPATH build.

One notable change (at least to me) is changing a "." into srcdir in
gpfdist Makefile. This is really easy to miss (again, to me).

While we're here I've taken the liberty to fix a surrounding mistake
like CPPFLAGS vs CFLAGS in src/test/regress.

This should let a VPATH build with ORCA disabled successfully compile.

gpMgmt/Makefile

 top_builddir = ..
 include $(top_builddir)/src/Makefile.global
-include $(top_builddir)/gpMgmt/Makefile.behave
+include $(top_srcdir)/gpMgmt/Makefile.behave
 
 SUBDIRS= sbin bin doc
 

src/backend/access/aocs/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=aocsam
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 aocsam.t: \
 	$(MOCK_DIR)/backend/catalog/pg_attribute_encoding_mock.o \

src/backend/access/appendonly/test/Makefile

@@ -5,7 +5,7 @@ include $(top_builddir)/src/Makefile.global
 TARGETS=aomd appendonly_visimap appendonly_visimap_entry \
 	aomd_filehandler aosegfiles
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 appendonly_visimap.t: \
 	$(MOCK_DIR)/backend/access/appendonly/appendonly_visimap_entry_mock.o \

src/backend/access/external/test/Makefile

@@ -4,6 +4,6 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=url_curl
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 url_curl.t: $(MOCK_DIR)/backend/cdb/cdbutil_mock.o

src/backend/access/rmgrdesc/test/Makefile

@@ -4,4 +4,4 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=xactdesc
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/access/transam/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=xact distributedlog xlog varsup
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 distributedlog.t: \
 	$(MOCK_DIR)/backend/access/transam/slru_mock.o \

src/backend/cdb/dispatcher/test/Makefile

@@ -5,7 +5,7 @@ include $(top_builddir)/src/Makefile.global
 TARGETS=cdbdispatchresult \
 		cdbgang
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 cdbdispatchresult.t: \
 	$(MOCK_DIR)/backend/libpq/pqexpbuffer_mock.o \
@@ -23,4 +23,4 @@ cdbgang.t: \
 	$(MOCK_DIR)/backend/utils/mmgr/redzone_handler_mock.o \
 	$(MOCK_DIR)/backend/utils/misc/faultinjector_mock.o
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/cdb/test/Makefile

@@ -7,7 +7,7 @@ TARGETS=cdbbufferedread \
 
 TARGETS += cdbappendonlyxlog
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 cdbdistributedsnapshot.t: $(MOCK_DIR)/backend/access/transam/distributedlog_mock.o
 

src/backend/commands/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=tablecmds
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 tablecmds.t: \
 	$(MOCK_DIR)/backend/access/aocs/aocs_compaction_mock.o

src/backend/fts/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=ftsmessagehandler ftsprobe
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 ftsmessagehandler.t: \
     $(MOCK_DIR)/backend/utils/error/assert_mock.o \

src/backend/libpq/Makefile

@@ -11,7 +11,7 @@
 subdir = src/backend/libpq
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
-override CPPFLAGS += -I$(libpq_srcdir) -I$(top_srcdir)/src/port
+override CPPFLAGS += -I$(libpq_srcdir) -I$(top_builddir)/src/port
 
 # be-fsstubs is here for historical reasons, probably belongs elsewhere
 

src/backend/libpq/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=pqcomm auth
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 auth.t: $(MOCK_DIR)/backend/utils/fmgr/fmgr_mock.o
 

src/backend/postmaster/test/Makefile

@@ -4,5 +4,5 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=checkpointer
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 checkpointer.t: $(MOCK_DIR)/backend/storage/lmgr/lwlock_mock.o

src/backend/replication/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=gp_replication
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 gp_replication.t: \
     $(MOCK_DIR)/backend/utils/error/assert_mock.o \

src/backend/storage/ipc/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=procarray
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 procarray.t: $(MOCK_DIR)/backend/storage/lmgr/lwlock_mock.o \
 			 $(MOCK_DIR)/backend/cdb/cdbtm_mock.o
 

src/backend/storage/lmgr/test/Makefile

@@ -4,4 +4,4 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=lock
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/tcop/test/Makefile

@@ -9,7 +9,7 @@ TARGETS=postgres
 # conflict resolution. If those hooks are needed then bring it back and then
 # enable the tests or delete the tests.
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 postgres.t: \
 	$(MOCK_DIR)/backend/commands/async_mock.o \

src/backend/utils/cache/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=lsyscache
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 lsyscache.t: \
 	$(MOCK_DIR)/backend/utils/cache/syscache_mock.o \

src/backend/utils/datumstream/test/Makefile

@@ -4,4 +4,4 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=datumstreamblock
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/utils/fmgr/test/Makefile

@@ -4,6 +4,6 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=dfmgr
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 dfmgr.t: $(MOCK_DIR)/backend/utils/error/elog_mock.o

src/backend/utils/hash/test/Makefile

@@ -4,6 +4,6 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=dynahash
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 dynahash.t: $(MOCK_DIR)/backend/access/transam/xact_mock.o

src/backend/utils/init/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=postinit
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 postinit.t: \
 	$(MOCK_DIR)/backend/utils/error/elog_mock.o \

src/backend/utils/misc/test/Makefile

@@ -7,4 +7,4 @@ TARGETS = ps_status bitstream bitmap_compression faultinjector_warnings pg_mkdir
 faultinjector_warnings.t: ../faultinjector_warnings.o faultinjector_warnings_test.o
 
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/utils/mmgr/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=vmem_tracker redzone_handler runaway_cleaner idle_tracker event_version memprot
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 vmem_tracker.t: \
 	$(MOCK_DIR)/backend/storage/ipc/shmem_mock.o \

src/backend/utils/resgroup/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=resgroup
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 resgroup.t: \
 	$(MOCK_DIR)/backend/commands/resgroupcmds_mock.o \

src/backend/utils/resource_manager/test/Makefile

@@ -4,4 +4,4 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=memquota
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/utils/sort/test/Makefile

@@ -4,4 +4,4 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=string_wrapper
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk

src/backend/utils/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=session_state
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 session_state.t: \
 	$(MOCK_DIR)/backend/storage/ipc/shmem_mock.o \

src/backend/utils/time/test/Makefile

@@ -4,7 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=sharedsnapshot
 
-include $(top_builddir)/src/backend/mock.mk
+include $(top_srcdir)/src/backend/mock.mk
 
 sharedsnapshot.t: \
 	$(MOCK_DIR)/backend/storage/ipc/shmem_mock.o \

src/bin/gpfdist/Makefile

@@ -2,7 +2,7 @@ subdir = src/bin/gpfdist
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I. $(CPPFLAGS) $(apr_includes) $(apr_cppflags)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(apr_includes) $(apr_cppflags)
 override CFLAGS := $(CFLAGS) $(apr_cflags)
 
 OBJS = gpfdist.o gpfdist_helper.o fstream.o gfile.o

src/bin/pg_dump/test/Makefile

@@ -6,7 +6,7 @@ TARGETS=dumputils
 
 override CPPFLAGS+= -I$(top_srcdir)/src/interfaces/libpq 
 
-include $(top_builddir)/src/Makefile.mock
+include $(top_srcdir)/src/Makefile.mock
 
 dumputils.t: dumputils_test.o $(CMOCKERY_OBJS)
 	$(CC) $^ $(libpq_pgport) $(LDFLAGS) $(LIBS) $(libpq) -o $@

src/interfaces/gppc/Makefile

@@ -8,7 +8,7 @@
 # GPPC needs (i.e. headers and makefiles) are installed along with pg_config.
 #-------------------------------------------------------------------------
 
-subdir = src/backend/gppc
+subdir = src/interfaces/gppc
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 

src/test/regress/GNUmakefile

@@ -48,7 +48,7 @@ pg_regress$(X): pg_regress.o pg_regress_main.o $(WIN32RES) | submake-libpgport s
 # dependencies ensure that path changes propagate
 pg_regress.o: pg_regress.c $(top_builddir)/src/port/pg_config_paths.h
 pg_regress.o: override CPPFLAGS += -I$(top_builddir)/src/port $(EXTRADEFS)
-regress_gp.o: override CFLAGS += -I$(top_builddir)/src/interfaces/libpq
+regress_gp.o: override CPPFLAGS += -I$(libpq_srcdir)
 regress_gp.o: override LDFLAGS += -L$(top_builddir)/src/interfaces/libpq
 
 .PHONY: scan_flaky_fault_injectors