Dropped support for building "in tree": always use PGXS

dvarrazzo · dvarrazzo · commit 71af7f20be12 · 2012-11-11T17:17:41.000Z
diff --git a/Makefile b/Makefile
@@ -5,23 +5,11 @@
 #  Portions Copyright (c) 2011, Itagaki Takahiro
 #  Portions Copyright (c) 2012, The Reorg Development Team
 #
-ifndef USE_PGXS
-top_builddir = ../..
-makefile_global = $(top_builddir)/src/Makefile.global
-ifeq "$(wildcard $(makefile_global))" ""
-USE_PGXS = 1	# use pgxs if not in contrib directory
-endif
-endif
 
-ifdef USE_PGXS
+USE_PGXS = 1
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-else
-subdir = pg_repack
-include $(makefile_global)
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
 
 SUBDIRS = bin lib
 
diff --git a/bin/Makefile b/bin/Makefile
@@ -19,23 +19,10 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
 endif
 PG_LIBS = $(libpq)
 
-ifndef USE_PGXS
-top_builddir = ../../..
-makefile_global = $(top_builddir)/src/Makefile.global
-ifeq "$(wildcard $(makefile_global))" ""
 USE_PGXS = 1	# use pgxs if not in contrib directory
-endif
-endif
-
-ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-else
-subdir = contrib/$(MODULE_big)
-include $(makefile_global)
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
 
 # remove dependency to libxml2 and libxslt
 LIBS := $(filter-out -lxml2, $(LIBS))
diff --git a/lib/Makefile b/lib/Makefile
@@ -20,23 +20,10 @@ EXTVER = $(shell grep -e '^default_version' $(EXTENSION).control \
 DATA_built = pg_repack.sql pg_repack--$(EXTVER).sql
 DATA = pg_repack--1.1.7--1.1.8.sql uninstall_pg_repack.sql
 
-ifndef USE_PGXS
-top_builddir = ../../..
-makefile_global = $(top_builddir)/src/Makefile.global
-ifeq "$(wildcard $(makefile_global))" ""
 USE_PGXS = 1	# use pgxs if not in contrib directory
-endif
-endif
-
-ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-else
-subdir = contrib/$(MODULE_big)
-include $(makefile_global)
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
 
 # remove dependency to libxml2 and libxslt
 LIBS := $(filter-out -lxml2, $(LIBS))
