From 90c409dfaa0fea0ee05a3773974a8d02adc35b4b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 18 Jun 2009 17:00:16 +0000 Subject: [PATCH] defs.mk: Add valdi module and some dependencies --- make/defs.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index 3d20b08b..400f8252 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -788,6 +788,7 @@ FEEDFS_VERSION = $(call version,$(FEEDFS_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION) USE_YTOOLS = true +USE_VALDI = true USE_AUTH = true INCLUDE += -I$(FEEDFS_DIR)/include LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs @@ -810,6 +811,7 @@ XCHANGE_VERSION = $(call version,$(XCHANGE_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION) USE_YTOOLS = true +USE_VALDI = true INCLUDE += -I$(XCHANGE_DIR)/include LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange endif @@ -880,10 +882,21 @@ AUTH_VERSION = $(call version,$(AUTH_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)auth-run = $(AUTH_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)auth-devel = $(AUTH_VERSION) USE_YTOOLS = true +USE_VALDI = true INCLUDE += -I$(AUTH_DIR)/include LIBFLAGS += -L$(AUTH_DIR)/lib -lauth endif +ifeq ($(USE_VALDI),true) +VALDI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/valdi /opt/$(FLAVOUR_PATH_PREFIX)valdi)) +VALDI_VERSION = $(call version,$(VALDI_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION) +USE_YTOOLS = true +#INCLUDE += -I$(VALDI_DIR)/include +#LIBFLAGS += -L$(VALDI_DIR)/lib -lvaldi +endif + ifeq ($(USE_YTOOLS),true) ifneq ($(PROJECT),ytools)