VPATH fix for ORCA-related Makefile.

This commit fixes up a host of top_builddir vs top_srcdir confusion,
uncovered by running a VPATH build (with ORCA enabled, of course).

I've also taken this opportunity to slightly eliminate some duplication,
using Makefile inclusion.

After this commit, a VPATH build should compile.

This resolves #10071.

src/backend/gpopt/Makefile

@@ -8,11 +8,7 @@
 subdir = src/backend/gpopt
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpos/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpopt/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS)
-
+include $(srcdir)/gpopt.mk
 
 SUBDIRS = config translate relcache utils
 

src/backend/gpopt/config/Makefile

@@ -9,7 +9,7 @@ subdir = src/backend/gpopt/config
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gpopt/gpopt.mk
+include $(top_srcdir)/src/backend/gpopt/gpopt.mk
 
 OBJS = CConfigParamMapping.o
 

src/backend/gpopt/gpopt.mk

-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpos/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpopt/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpos/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpopt/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS)

src/backend/gpopt/relcache/Makefile

@@ -9,7 +9,7 @@ subdir = src/backend/gpopt/relcache
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gpopt/gpopt.mk
+include $(top_srcdir)/src/backend/gpopt/gpopt.mk
 
 OBJS = CMDProviderRelcache.o
 

src/backend/gpopt/translate/Makefile

@@ -9,7 +9,7 @@ subdir = src/backend/gpopt/translate
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gpopt/gpopt.mk
+include $(top_srcdir)/src/backend/gpopt/gpopt.mk
 
 OBJS =  CMappingColIdVar.o \
 		CMappingVarColId.o \

src/backend/gpopt/utils/Makefile

@@ -9,7 +9,7 @@ subdir = src/backend/gpopt/utils
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gpopt/gpopt.mk
+include $(top_srcdir)/src/backend/gpopt/gpopt.mk
 
 OBJS = COptTasks.o CConstExprEvaluatorProxy.o CMemoryPoolPalloc.o CMemoryPoolPallocManager.o funcs.o
 

src/backend/gporca/gporca.mk

-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpos/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpopt/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS)
-override CPPFLAGS := -I$(top_builddir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpos/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpopt/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS)
 # Do not omit frame pointer. Even with RELEASE builds, it is used for
 # backtracing.
 override CXXFLAGS := -Werror -Wextra -Wpedantic -Wno-variadic-macros -fno-omit-frame-pointer $(CXXFLAGS)

src/backend/gporca/libgpdbcost/src/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpdbcost/src
 top_builddir = ../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CCostModelGPDB.o \
               CCostModelGPDBLegacy.o \

src/backend/gporca/libgpopt/src/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src
 top_builddir = ../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 SUBDIRS     = base engine eval mdcache metadata minidump operators optimizer search translate xforms
 OBJS        = exception.o init.o

src/backend/gporca/libgpopt/src/base/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/base
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CAutoOptCtxt.o \
               CCTEInfo.o \

src/backend/gporca/libgpopt/src/engine/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/engine
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CEngine.o \
               CEnumeratorConfig.o \

src/backend/gporca/libgpopt/src/eval/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/eval
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CConstExprEvaluatorDXL.o \
               CConstExprEvaluatorDefault.o

src/backend/gporca/libgpopt/src/mdcache/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/mdcache
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CMDAccessor.o \
               CMDAccessorUtils.o \

src/backend/gporca/libgpopt/src/metadata/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/metadata
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CColumnDescriptor.o \
               CIndexDescriptor.o \

src/backend/gporca/libgpopt/src/minidump/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/minidump
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CDXLMinidump.o \
               CMetadataAccessorFactory.o \

src/backend/gporca/libgpopt/src/operators/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/operators
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CExpression.o \
               CExpressionFactorizer.o \

src/backend/gporca/libgpopt/src/optimizer/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/optimizer
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = COptimizer.o COptimizerConfig.o
 

src/backend/gporca/libgpopt/src/search/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/search
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CBinding.o \
               CGroup.o \

src/backend/gporca/libgpopt/src/translate/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/translate
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CTranslatorDXLToExpr.o \
               CTranslatorDXLToExprUtils.o \

src/backend/gporca/libgpopt/src/xforms/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpopt/src/xforms
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CDecorrelator.o \
               CJoinOrder.o \

src/backend/gporca/libgpos/src/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src
 top_builddir = ../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 SUBDIRS     = common error io memory string task
 OBJS        = _api.o utils.o

src/backend/gporca/libgpos/src/common/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/common
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CAutoTimer.o \
               CBitSet.o \

src/backend/gporca/libgpos/src/error/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/error
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CAutoExceptionStack.o \
               CAutoTrace.o \

src/backend/gporca/libgpos/src/io/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/io
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CFileDescriptor.o \
               CFileReader.o \

src/backend/gporca/libgpos/src/memory/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/memory
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CAutoMemoryPool.o \
               CCacheFactory.o \

src/backend/gporca/libgpos/src/string/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/string
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CStringStatic.o \
               CWString.o \

src/backend/gporca/libgpos/src/task/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/task
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CAutoSuspendAbort.o \
               CAutoTaskProxy.o \

src/backend/gporca/libgpos/src/test/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libgpos/src/memory
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 include $(top_srcdir)/src/backend/common.mk
 

src/backend/gporca/libnaucrates/src/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src
 top_builddir = ../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 SUBDIRS     = base md operators parser statistics xml
 OBJS        = CCostModelConfigSerializer.o \

src/backend/gporca/libnaucrates/src/base/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src/base
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CDatumBoolGPDB.o \
               CDatumGenericGPDB.o \

src/backend/gporca/libnaucrates/src/md/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src/md
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CDXLBucket.o \
               CDXLColStats.o \

src/backend/gporca/libnaucrates/src/operators/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src/operators
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CDXLColDescr.o \
               CDXLColRef.o \

src/backend/gporca/libnaucrates/src/parser/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src/parser
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CParseHandlerAgg.o \
               CParseHandlerAppend.o \

src/backend/gporca/libnaucrates/src/statistics/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src/statistics
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CBucket.o \
               CFilterStatsProcessor.o \

src/backend/gporca/libnaucrates/src/xml/Makefile

@@ -8,7 +8,7 @@ subdir = src/backend/gporca/libnaucrates/src/xml
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-include $(top_builddir)/src/backend/gporca/gporca.mk
+include $(top_srcdir)/src/backend/gporca/gporca.mk
 
 OBJS        = CDXLMemoryManager.o \
               CDXLSections.o \