Also remove references to enable_segwalrep in Makefiles.

I removed the autoconf flag and #ifdefs earlier, but missed these.

GNUmakefile.in

@@ -159,12 +159,11 @@ installcheck-world:
 	$(MAKE) -C src/test/kerberos installcheck
 	$(MAKE) -C gpMgmt/bin installcheck
 	gpcheckcat -A
-ifeq ($(enable_segwalrep), yes)
 	# Verify the filesystem objects are consistent between primary and mirror
 	$(MAKE) -C contrib/gp_replica_check installcheck
-else
-	$(MAKE) -C contrib/pg_upgrade check
-endif
+
+	# WALREP_FIXME: pg_upgrade doesn't work yet?
+	#$(MAKE) -C contrib/pg_upgrade check
 
 installcheck-resgroup:
 	$(MAKE) -C src/test/isolation2 $@

gpAux/gpdemo/Makefile

@@ -38,7 +38,6 @@ all:
 	$(MAKE) probe
 
 cluster create-demo-cluster:
-ifeq ($(enable_segwalrep), yes)
 	@WITH_MIRRORS=false ./demo_cluster.sh # will generate gpdemo-env.sh
 ifeq ($(WITH_MIRRORS), true)
 	@. ./gpdemo-env.sh; \
@@ -46,10 +45,6 @@ ifeq ($(WITH_MIRRORS), true)
 	./gpsegwalrep.py start;
 endif
 	@echo ""
-else
-	@./demo_cluster.sh
-	@echo ""
-endif
 
 probe:
 	@./probe_config.sh

src/Makefile.global.in

@@ -196,7 +196,6 @@ enable_mapreduce    = @enable_mapreduce@
 enable_gpcloud 	    = @enable_gpcloud@
 enable_gpperfmon    = @enable_gpperfmon@
 
-enable_segwalrep    = @enable_segwalrep@
 enable_tap_tests = @enable_tap_tests@
 
 python_includespec	= @python_includespec@

src/backend/access/transam/test/Makefile

@@ -4,9 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS=xact distributedlog xlog
 
-ifeq ($(enable_segwalrep), yes)
 TARGETS += xlogutils
-endif
 
 include $(top_builddir)/src/backend/mock.mk
 

src/backend/cdb/test/Makefile

@@ -8,9 +8,7 @@ TARGETS=cdbtm \
 	cdbsrlz \
 	cdbdistributedsnapshot
 
-ifeq ($(enable_segwalrep), yes)
 TARGETS += cdbappendonlystorage cdbmirroredappendonly
-endif
 
 include $(top_builddir)/src/backend/mock.mk
 cdbtm.t: $(MOCK_DIR)/backend/storage/lmgr/lwlock_mock.o

src/backend/fts/Makefile

@@ -12,7 +12,5 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS = fts.o ftsprobe.o
-ifeq ($(enable_segwalrep), yes)
 OBJS += ftsmessagehandler.o
-endif
 include $(top_srcdir)/src/backend/common.mk

src/backend/fts/test/Makefile

@@ -2,7 +2,6 @@ subdir=src/backend/fts
 top_builddir=../../../..
 include $(top_builddir)/src/Makefile.global
 
-ifeq ($(enable_segwalrep), yes)
 TARGETS=ftsmessagehandler ftsprobe fts
 
 include $(top_builddir)/src/backend/mock.mk
@@ -30,4 +29,3 @@ fts.t: \
     $(MOCK_DIR)/backend/catalog/indexing_mock.o \
     $(MOCK_DIR)/backend/access/common/scankey_mock.o \
     $(MOCK_DIR)/backend/access/index/genam_mock.o
-endif

src/backend/replication/test/Makefile

@@ -2,7 +2,6 @@ subdir=src/backend/replication
 top_builddir=../../../..
 include $(top_builddir)/src/Makefile.global
 
-ifeq ($(enable_segwalrep), yes)
 TARGETS=gp_replication
 
 include $(top_builddir)/src/backend/mock.mk
@@ -13,4 +12,3 @@ gp_replication.t: \
 	$(MOCK_DIR)/backend/utils/misc/guc_gp_mock.o \
     $(MOCK_DIR)/backend/storage/lmgr/lwlock_mock.o \
 	$(MOCK_DIR)/backend/storage/ipc/shmqueue_mock.o
-endif

src/backend/utils/misc/test/Makefile

@@ -4,9 +4,7 @@ include $(top_builddir)/src/Makefile.global
 
 TARGETS = ps_status bitstream bitmap_compression
 
-ifeq ($(enable_segwalrep), yes)
 TARGETS += guc_gp
-endif
 
 include $(top_builddir)/src/backend/mock.mk
 

src/test/isolation2/Makefile

@@ -20,9 +20,7 @@ endif
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
 override LDLIBS := $(libpq_pgport) $(LDLIBS)
 
-ifeq ($(enable_segwalrep), yes)
 EXTRA_TESTS=segwalrep/commit_blocking segwalrep/fts_unblock_primary
-endif
 
 all: pg_isolation2_regress$(X) all-lib
 

src/test/regress/GNUmakefile

@@ -180,9 +180,7 @@ pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MUL
 # These are currently skipped because they don't work yet for segment wal replication
 # segspace: cannot restart database at the moment
 # filespace: segment wal replication does not handle filespaces yet
-ifeq ($(enable_segwalrep), yes)
 pg_regress_call := $(pg_regress_call) --exclude-tests="segspace_setup segspace segspace_cleanup filespace"
-endif
 
 check: all
 	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule 

src/test/walrep/Makefile

@@ -11,13 +11,11 @@ REGRESS = setup walreceiver
 
 # These two tests can only run without mirrors due to limit of 1
 # walsender-walreceiver connection only
-ifeq ($(enable_segwalrep), yes)
 ifeq ($(WITH_MIRRORS), false)
 REGRESS += generate_ao_xlog generate_aoco_xlog replication_views_mirrorless
 else
 REGRESS += replication_views_mirrored missing_xlog
 endif
-endif
 REGRESS_OPTS = --dbname="walrep_regression"
 
 NO_PGXS = 1