From 98c83a1c13b267336cfb636bdc7c1e1176405e8f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 2 Aug 2014 15:02:46 +0000 Subject: [PATCH] defs.mk: Add support for build prerequisite feedfs-circuit Signed-off-by: Jan Lindemann --- make/defs.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index 1f4c4e34..f6d7b99d 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -1167,6 +1167,19 @@ EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin PREREQ += FEEDFS_NET endif +ifneq ($(filter feedfs-circuit,$(PREREQ_BUILD)),) +FEEDFS_CIRCUIT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-circuit /opt/$(FLAVOUR_PATH_PREFIX)feedfs-circuit)) +FEEDFS_CIRCUIT_VERSION = $(call version,$(FEEDFS_CIRCUIT_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-circuit-run = $(FEEDFS_CIRCUIT_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-circuit-devel = $(FEEDFS_CIRCUIT_VERSION) +PREREQ_BUILD += feedfs-objects +PREREQ_BUILD += ytools +INCLUDE += -I$(FEEDFS_CIRCUIT_DIR)/include +LIBFLAGS += -L$(FEEDFS_CIRCUIT_DIR)/lib -lfeedfs-circuit +EXE_SEARCH_PATH += $(FEEDFS_CIRCUIT_DIR)/bin +PREREQ += FEEDFS_CIRCUIT +endif + ifneq ($(filter feedfs-ini,$(PREREQ_BUILD)),) FEEDFS_INI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-ini /opt/$(FLAVOUR_PATH_PREFIX)feedfs-ini)) FEEDFS_INI_VERSION = $(call version,$(FEEDFS_INI_DIR))