From 8a9cfed9a76e8de18847af907ad469e0eb95d562 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 10 Sep 2007 14:49:13 +0000 Subject: [PATCH] defs.mk: Sorted out some dependencies --- make/defs.mk | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 1ed575b7..dfe09a97 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -560,47 +560,24 @@ LIBFLAGS += $(LOCAL_LDFLAGS) -L$(BUILD_LIBDIR) # -- use of supplementary libraries -ifeq ($(USE_USERVER),true) -USERVER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/$(FLAVOUR_PATH_PREFIX)userver)) -USERVER_VERSION = $(call cat_version,$(USERVER_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION) -USE_XCHANGE = true +ifeq ($(USE_CCASFS),true) +CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs)) +CCASFS_VERSION = $(call cat_version,$(CCASFS_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION) USE_YTOOLS = true -INCLUDE += -I$(USERVER_DIR)/include -LIBFLAGS += -L$(USERVER_DIR)/lib -luserver +INCLUDE += -I$(CCASFS_DIR)/include +#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole endif -ifeq ($(USE_XCHANGE),true) -XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/$(FLAVOUR_PATH_PREFIX)xchange)) -XCHANGE_VERSION = $(call cat_version,$(XCHANGE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION) +ifeq ($(USE_CCONSOLE),true) +CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/$(FLAVOUR_PATH_PREFIX)dspider/cconsole)) +CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION) USE_YTOOLS = true -INCLUDE += -I$(XCHANGE_DIR)/include -LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange -endif - -ifeq ($(USE_FEEDFS_UTILS),true) -FEEDFS_UTILS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-utils /opt/$(FLAVOUR_PATH_PREFIX)feedfs-utils)) -FEEDFS_UTILS_VERSION = $(call cat_version,$(FEEDFS_UTILS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-utils-run = $(FEEDFS_UTILS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION) -USE_FEEDFS = true -USE_YTOOLS = true -INCLUDE += -I$(FEEDFS_UTILS_DIR)/include -LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils -endif - -ifeq ($(USE_FEEDFS),true) -FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs)) -FEEDFS_VERSION = $(call cat_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 -INCLUDE += -I$(FEEDFS_DIR)/include -LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs +INCLUDE += -I$(CCONSOLE_DIR)/include +#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole endif ifeq ($(USE_DSPCD),true) @@ -644,6 +621,49 @@ INCLUDE += -I$(DSPIDER_SHARED_DIR)/include LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared endif +ifeq ($(USE_FEEDFS_UTILS),true) +FEEDFS_UTILS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-utils /opt/$(FLAVOUR_PATH_PREFIX)feedfs-utils)) +FEEDFS_UTILS_VERSION = $(call cat_version,$(FEEDFS_UTILS_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-utils-run = $(FEEDFS_UTILS_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION) +USE_FEEDFS = true +USE_YTOOLS = true +INCLUDE += -I$(FEEDFS_UTILS_DIR)/include +LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils +endif + +ifeq ($(USE_FEEDFS),true) +FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs)) +FEEDFS_VERSION = $(call cat_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 +INCLUDE += -I$(FEEDFS_DIR)/include +LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs +endif + +ifeq ($(USE_USERVER),true) +USERVER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/$(FLAVOUR_PATH_PREFIX)userver)) +USERVER_VERSION = $(call cat_version,$(USERVER_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION) +USE_XCHANGE = true +USE_YTOOLS = true +INCLUDE += -I$(USERVER_DIR)/include +LIBFLAGS += -L$(USERVER_DIR)/lib -luserver +endif + +ifeq ($(USE_XCHANGE),true) +XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/$(FLAVOUR_PATH_PREFIX)xchange)) +XCHANGE_VERSION = $(call cat_version,$(XCHANGE_DIR)) +RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION) +RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION) +USE_YTOOLS = true +INCLUDE += -I$(XCHANGE_DIR)/include +LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange +endif + ifeq ($(USE_BTOOLS),true) BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/$(FLAVOUR_PATH_PREFIX)btools)) BTOOLS_VERSION = $(call cat_version,$(BTOOLS_DIR)) @@ -654,26 +674,6 @@ INCLUDE += -I$(BTOOLS_DIR)/include LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools endif -ifeq ($(USE_CCONSOLE),true) -CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/$(FLAVOUR_PATH_PREFIX)dspider/cconsole)) -CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION) -USE_YTOOLS = true -INCLUDE += -I$(CCONSOLE_DIR)/include -#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole -endif - -ifeq ($(USE_CCASFS),true) -CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs)) -CCASFS_VERSION = $(call cat_version,$(CCASFS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION) -USE_YTOOLS = true -INCLUDE += -I$(CCASFS_DIR)/include -#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole -endif - ifeq ($(USE_JACKJART),true) JACKJART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackjart /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackjart)) JACKJART_VERSION = $(call cat_version,$(JACKJART_DIR))