From 5f6e78a717e55be92880297ac749f6007f57c6f6 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 25 Feb 2009 20:12:58 +0000 Subject: [PATCH] defs.mk: Update USE_AUTH and USE_XCHANGE - Move USE_AUTH to bottom where it has effect - Shift USE_XCHANGE from feedfs to feedfs-net following the same shift in the client and server worker plugins --- make/defs.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 3cd9eddc..481d52b3 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -632,16 +632,6 @@ LIBFLAGS += -L$(BUILD_LIBDIR) # -- use of supplementary libraries -ifeq ($(USE_AUTH),true) -AUTH_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/auth /opt/$(FLAVOUR_PATH_PREFIX)auth)) -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 -INCLUDE += -I$(AUTH_DIR)/include -LIBFLAGS += -L$(AUTH_DIR)/lib -lauth -endif - ifeq ($(USE_CCASFS),true) CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs)) CCASFS_VERSION = $(call version,$(CCASFS_DIR)) @@ -754,6 +744,7 @@ FEEDFS_NET_VERSION = $(call version,$(FEEDFS_NET_DIR)) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-net-run = $(FEEDFS_NET_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-net-devel = $(FEEDFS_NET_VERSION) USE_FEEDFS = true +USE_XCHANGE = true USE_YTOOLS = true INCLUDE += -I$(FEEDFS_NET_DIR)/include LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net @@ -765,7 +756,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_XCHANGE = true +USE_AUTH = true INCLUDE += -I$(FEEDFS_DIR)/include LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs endif @@ -851,6 +842,17 @@ INCLUDE += -I$(DSPFS_DIR)/include LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs endif +ifeq ($(USE_AUTH),true) +AUTH_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/auth /opt/$(FLAVOUR_PATH_PREFIX)auth)) +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 +INCLUDE += -I$(AUTH_DIR)/include +LIBFLAGS += -L$(AUTH_DIR)/lib -lauth +endif + + ifeq ($(USE_YTOOLS),true) ifneq ($(PROJECT),ytools) YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))