external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address latest comments after merge from master

pull/5661/head
Yanwen Jin 2022-02-07 12:09:25 -08:00
parent c758d94742
commit e262f6ff48
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -13,10 +13,11 @@ include Makefile.global
all: extension all: extension
ENSURE_SUBDIRS_EXIST := $(shell mkdir -p $(SUBDIRS))
#build columnar only #build columnar only
columnar: columnar:
$(MAKE) -C src/backend/columnar all $(MAKE) -C src/backend/columnar all
cp $(citus_top_builddir)/src/backend/columnar/columnar.so $(citus_top_builddir)/src/backend/distributed/
# build extension # build extension
extension: $(citus_top_builddir)/src/include/citus_version.h columnar extension: $(citus_top_builddir)/src/include/citus_version.h columnar
$(MAKE) -C src/backend/distributed/ all $(MAKE) -C src/backend/distributed/ all
@ -33,7 +34,6 @@ install-headers: extension
clean-extension: clean-extension:
$(MAKE) -C src/backend/distributed/ clean $(MAKE) -C src/backend/distributed/ clean
rm -f $(citus_top_builddir)/src/backend/distributed/columnar.so
$(MAKE) -C src/backend/columnar/ clean $(MAKE) -C src/backend/columnar/ clean
clean-full: clean-full:
$(MAKE) -C src/backend/distributed/ clean-full $(MAKE) -C src/backend/distributed/ clean-full

14
src/backend/columnar/Makefile
View File

@ -1,22 +1,14 @@
citus_subdir = src/backend/columnar citus_subdir = src/backend/columnar
citus_top_builddir = ../../..
safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib
SUBDIRS = . safeclib SUBDIRS = . safeclib
SUBDIRS += SUBDIRS +=
OBJS += \ OBJS += \
$(patsubst $(citus_subdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_subdir)/$(dir)/*.c)))) $(patsubst $(citus_abs_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_abs_srcdir)/$(dir)/*.c))))
MODULE_big = columnar MODULE_big = columnar
PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include
include $(citus_top_builddir)/Makefile.global
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = src/backend/columnar
top_builddir = ../../..
include $(top_builddir)/Makefile.global
endif

3
src/backend/distributed/Makefile
View File

@ -36,7 +36,8 @@ all:
NO_PGXS = 1 NO_PGXS = 1
SHLIB_LINK += $(libpq) columnar.so SHLIB_LINK += $(libpq)
SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so
include $(citus_top_builddir)/Makefile.global include $(citus_top_builddir)/Makefile.global