janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

defs.mk: Feedfs-rewrite now supplies a lib, use that

Browse source 
Add -lfeedfs-rewrite and -I$(FEEDFS_REWRITE_DIR)/include if
USE_FEEDFS_REWRITE is true.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-09-03 16:02:47 +00:00
commit da43cab497
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs.mk
View file

@ -1212,10 +1212,11 @@ FEEDFS_REWRITE_VERSION = $(call version,$(FEEDFS_REWRITE_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-rewrite-run = $(FEEDFS_REWRITE_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-rewrite-run = $(FEEDFS_REWRITE_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-rewrite-devel = $(FEEDFS_REWRITE_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-rewrite-devel = $(FEEDFS_REWRITE_VERSION)
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
# no build-time linkage necessary, no headers exported
LD_LIB_PATH += $(FEEDFS_REWRITE_DIR)/lib LD_LIB_PATH += $(FEEDFS_REWRITE_DIR)/lib
EXE_SEARCH_PATH += $(FEEDFS_REWRITE_DIR)/bin EXE_SEARCH_PATH += $(FEEDFS_REWRITE_DIR)/bin
LIBFLAGS += -lboost_regex INCLUDE += -I$(FEEDFS_REWRITE_DIR)/include
LIBFLAGS += -L$(FEEDFS_REWRITE_DIR)/lib -lfeedfs-rewrite
PREREQ += FEEDFS_REWRITE PREREQ += FEEDFS_REWRITE
endif endif