janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk: Don't prefix all RPM_REQUIRES_XXX with FLAVOUR_PREFIX

Browse source 
RPM_REQUIRES_RUN and RPM_REQUIRES_DEVEL are now not automatically
prefixed by $(FLAVOUR_PREFIX) anylonger, to make hand-crafted
cross-flavour dependencies possible.
This commit is contained in:
Jan Lindemann 2007-09-04 08:01:08 +00:00 • committed by Jan Lindemann
commit cee9062f87
1 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

69
make/defs.mk
View file

@ -548,8 +548,8 @@ LIBFLAGS += $(LOCAL_LDFLAGS) -L$(BUILD_LIBDIR)
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 += userver-run = $(USERVER_VERSION)
RPM_REQUIRES_DEVEL += userver-devel = $(USERVER_VERSION)
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
@ -559,8 +559,8 @@ 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 += xchange-run = $(XCHANGE_VERSION)
RPM_REQUIRES_DEVEL += xchange-devel = $(XCHANGE_VERSION)
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
@ -569,8 +569,8 @@ 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 += feedfs-utils-run = $(FEEDFS_UTILS_VERSION)
RPM_REQUIRES_DEVEL += feedfs-utils-devel = $(FEEDFS_UTILS_VERSION)
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
@ -580,8 +580,8 @@ 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 += feedfs-run = $(FEEDFS_VERSION)
RPM_REQUIRES_DEVEL += feedfs-devel = $(FEEDFS_VERSION)
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
@ -593,8 +593,8 @@ DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsp
DSPCD_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider))
include $(DSPCD_DIR)/make/public.mk
DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR))
RPM_REQUIRES_RUN += dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION)
RPM_REQUIRES_DEVEL += dspider-dspcd-devel = $(DSPIDER_DSPCD_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-devel = $(DSPIDER_DSPCD_VERSION)
USE_YTOOLS = true
USE_DSPIDER_SHARED = true
USE_USERVER = true
@ -607,8 +607,8 @@ ifeq ($(USE_DSPROUT),true)
DSPROUT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/dspider/$(FLAVOUR_PATH_PREFIX)dsprout))
DSPROUT_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/$(FLAVOUR_PATH_PREFIX)dspider))
DSPROUT_VERSION = $(call cat_version,$(DSPROUT_DIR))
RPM_REQUIRES_RUN += dsprout-run = $(DSPROUT_VERSION)
RPM_REQUIRES_DEVEL += dsprout-devel = $(DSPROUT_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION)
USE_YTOOLS = true
USE_DSPIDER_SHARED = true
USE_XCHANGE = true
@ -622,8 +622,8 @@ DSPIDER_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/sha
DSPIDER_SHARED_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider))
include $(DSPIDER_SHARED_DIR)/make/public.mk
DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR))
RPM_REQUIRES_RUN += dspider-shared-run = $(DSPIDER_SHARED_VERSION)
RPM_REQUIRES_DEVEL += dspider-shared-devel = $(DSPIDER_SHARED_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-devel = $(DSPIDER_SHARED_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(DSPIDER_SHARED_DIR)/include
LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared
@ -632,8 +632,8 @@ 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))
RPM_REQUIRES_RUN += dspider-btools-run = $(BTOOLS_VERSION)
RPM_REQUIRES_DEVEL += dspider-btools-devel = $(BTOOLS_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(BTOOLS_DIR)/include
LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools
@ -642,8 +642,8 @@ 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 += dspider-cconsole-run = $(CCONSOLE_VERSION)
RPM_REQUIRES_DEVEL += dspider-cconsole-devel = $(CCONSOLE_VERSION)
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
@ -652,8 +652,8 @@ endif
ifeq ($(USE_CCASFS),true)
CCONSOLE_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 += dspider-ccasfs-run = $(CCASFS_VERSION)
RPM_REQUIRES_DEVEL += dspider-ccasfs-devel = $(CCASFS_VERSION)
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
@ -662,8 +662,8 @@ 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))
RPM_REQUIRES_RUN += jackjart-run = $(JACKJART_VERSION)
RPM_REQUIRES_DEVEL += jackjart-devel = $(JACKJART_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(JACKJART_DIR)/include
LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart
@ -672,8 +672,8 @@ endif
ifeq ($(USE_JACKRTAI),true)
JACKRTAI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackrtai /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackrtai))
JACKRTAI_VERSION = $(call cat_version,$(JACKRTAI_DIR))
RPM_REQUIRES_RUN += jackrtai-run = $(JACKRTAI_VERSION)
RPM_REQUIRES_DEVEL += jackrtai-devel = $(JACKRTAI_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(JACKRTAI_DIR)/include
LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai
@ -682,8 +682,8 @@ endif
ifeq ($(USE_JACKDUMMY),true)
JACKDUMMY_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackdummy /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackdummy))
JACKDUMMY_VERSION = $(call cat_version,$(JACKDUMMY_DIR))
RPM_REQUIRES_RUN += jackdummy-run = $(JACKDUMMY_VERSION)
RPM_REQUIRES_DEVEL += jackdummy-devel = $(JACKDUMMY_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackdummy-run = $(JACKDUMMY_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackdummy-devel = $(JACKDUMMY_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(JACKDUMMY_DIR)/include
LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy
@ -692,8 +692,8 @@ endif
ifeq ($(USE_ALSART),true)
ALSART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/alsart /opt/$(FLAVOUR_PATH_PREFIX)dspider/alsart))
ALSART_VERSION = $(call cat_version,$(ALSART_DIR))
RPM_REQUIRES_RUN += alsart-run = $(ALSART_VERSION)
RPM_REQUIRES_DEVEL += alsart-devel = $(ALSART_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(ALSART_DIR)/include
LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart
@ -702,8 +702,8 @@ endif
ifeq ($(USE_DSPFS),true)
DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$(FLAVOUR_PATH_PREFIX)dspfs))
DSPFS_VERSION = $(call cat_version,$(DSPFS_DIR))
RPM_REQUIRES_RUN += dspfs-run = $(DSPFS_VERSION)
RPM_REQUIRES_DEVEL += dspfs-devel = $(DSPFS_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION)
USE_YTOOLS = true
INCLUDE += -I$(DSPFS_DIR)/include
LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs
@ -717,8 +717,8 @@ YTOOLS_DIR = $(TOPDIR)
endif
YTOOLS_VERSION = $(call cat_version,$(YTOOLS_DIR))
ifneq ($(PROJECT),ytools)
RPM_REQUIRES_RUN += ytools-run >= $(YTOOLS_VERSION)
RPM_REQUIRES_DEVEL += ytools-devel >= $(YTOOLS_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run >= $(YTOOLS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel >= $(YTOOLS_VERSION)
endif
INCLUDE += -I$(YTOOLS_DIR)/include
LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools
@ -727,7 +727,7 @@ endif
ifeq ($(USE_SCOPE_CASMIX),true)
SCOPE_CASMIX_DIR = /opt/scope-casmix
SCOPE_CASMIX_VERSION = $(call cat_version,/usr/share/doc/packages/scope-casmix-devel)
RPM_REQUIRES_RUN += scope-casmix >= $(SCOPE_CASMIX_VERSION)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)scope-casmix >= $(SCOPE_CASMIX_VERSION)
RPM_REQUIRES_DEVEL += scope-casmix-devel >= $(SCOPE_CASMIX_VERSION)
INCLUDE += -I$(SCOPE_CASMIX_DIR)/include
LIBFLAGS += -L$(SCOPE_CASMIX_DIR)/lib -lscope-casmix
@ -763,6 +763,7 @@ endif
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
#RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')