farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniele Varrazzo 2012-11-11 17:17:41 +00:00
parent 1d60a946ff
commit 71af7f20be
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -5,23 +5,11 @@
# Portions Copyright (c) 2011, Itagaki Takahiro # Portions Copyright (c) 2011, Itagaki Takahiro
# Portions Copyright (c) 2012, The Reorg Development Team # 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 PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS) include $(PGXS)
else
subdir = pg_repack
include $(makefile_global)
include $(top_srcdir)/contrib/contrib-global.mk
endif
SUBDIRS = bin lib SUBDIRS = bin lib

13
bin/Makefile
View File

@ -19,23 +19,10 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
endif endif
PG_LIBS = $(libpq) 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 USE_PGXS = 1 # use pgxs if not in contrib directory
endif
endif
ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(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 # remove dependency to libxml2 and libxslt
LIBS := $(filter-out -lxml2, $(LIBS)) LIBS := $(filter-out -lxml2, $(LIBS))

13
lib/Makefile
View File

@ -20,23 +20,10 @@ EXTVER = $(shell grep -e '^default_version' $(EXTENSION).control \
DATA_built = pg_repack.sql pg_repack--$(EXTVER).sql DATA_built = pg_repack.sql pg_repack--$(EXTVER).sql
DATA = pg_repack--1.1.7--1.1.8.sql uninstall_pg_repack.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 USE_PGXS = 1 # use pgxs if not in contrib directory
endif
endif
ifdef USE_PGXS
PG_CONFIG = pg_config PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(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 # remove dependency to libxml2 and libxslt
LIBS := $(filter-out -lxml2, $(LIBS)) LIBS := $(filter-out -lxml2, $(LIBS))