From 4be2beaf2897ba975ed96470d5afc4e9592c729c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 18 Sep 2016 12:43:22 +0000 Subject: [PATCH] lib-deps.mk: Remove explicit dependency specification from packages in lib-deps.mk This should now be handled from within projects.conf Signed-off-by: Jan Lindemann --- make/lib-deps.mk | 250 +++++++++++++++++++++++------------------------ 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/make/lib-deps.mk b/make/lib-deps.mk index 5a28ce42..dd02eb26 100644 --- a/make/lib-deps.mk +++ b/make/lib-deps.mk @@ -3,8 +3,8 @@ ifneq ($(filter feedfs-nexus,$(PREREQ_BUILD)),) FEEDFS_NEXUS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-nexus /opt/$(FLAVOUR_PATH_PREFIX)feedfs-nexus)) FEEDFS_NEXUS_VERSION = $(call version,$(FEEDFS_NEXUS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-nexus-run = $(FEEDFS_NEXUS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-nexus-devel = $(FEEDFS_NEXUS_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-nexus-run = $(FEEDFS_NEXUS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-nexus-devel = $(FEEDFS_NEXUS_VERSION) PREREQ_BUILD += feedfs-objects feedfs-dsp INCLUDE += -I$(FEEDFS_NEXUS_DIR)/include LIBFLAGS += -L$(FEEDFS_NEXUS_DIR)/lib -lfeedfs-nexus @@ -15,8 +15,8 @@ endif ifneq ($(filter feedfs-xchange,$(PREREQ_BUILD)),) FEEDFS_XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-xchange /opt/$(FLAVOUR_PATH_PREFIX)feedfs-xchange)) FEEDFS_XCHANGE_VERSION = $(call version,$(FEEDFS_XCHANGE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-xchange-run = $(FEEDFS_XCHANGE_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-xchange-devel = $(FEEDFS_XCHANGE_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-xchange-run = $(FEEDFS_XCHANGE_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-xchange-devel = $(FEEDFS_XCHANGE_VERSION) PREREQ_BUILD += xchange feedfs-objects INCLUDE += -I$(FEEDFS_XCHANGE_DIR)/include LIBFLAGS += -L$(FEEDFS_XCHANGE_DIR)/lib -lfeedfs-xchange @@ -27,8 +27,8 @@ endif ifneq ($(filter feedfs-ict,$(PREREQ_BUILD)),) FEEDFS_ICT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-ict /opt/$(FLAVOUR_PATH_PREFIX)feedfs-ict)) FEEDFS_ICT_VERSION = $(call version,$(FEEDFS_ICT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ict-run = $(FEEDFS_ICT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ict-devel = $(FEEDFS_ICT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ict-run = $(FEEDFS_ICT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ict-devel = $(FEEDFS_ICT_VERSION) PREREQ_BUILD += feedfs-objects feedfs-dsp INCLUDE += -I$(FEEDFS_ICT_DIR)/include LIBFLAGS += -L$(FEEDFS_ICT_DIR)/lib -lfeedfs-ict @@ -39,8 +39,8 @@ endif ifneq ($(filter xchange-nexus,$(PREREQ_BUILD)),) XCHANGE_NEXUS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange-nexus /opt/$(FLAVOUR_PATH_PREFIX)xchange-nexus)) XCHANGE_NEXUS_VERSION = $(call version,$(XCHANGE_NEXUS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-nexus-run = $(XCHANGE_NEXUS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-nexus-devel = $(XCHANGE_NEXUS_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-nexus-run = $(XCHANGE_NEXUS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-nexus-devel = $(XCHANGE_NEXUS_VERSION) PREREQ_BUILD += xchange devnet INCLUDE += -I$(XCHANGE_NEXUS_DIR)/include LIBFLAGS += -L$(XCHANGE_NEXUS_DIR)/lib -lxchange-nexus @@ -51,8 +51,8 @@ endif ifneq ($(filter feedfs-mixer,$(PREREQ_BUILD)),) FEEDFS_MIXER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-mixer /opt/$(FLAVOUR_PATH_PREFIX)feedfs-mixer)) FEEDFS_MIXER_VERSION = $(call version,$(FEEDFS_MIXER_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-mixer-run = $(FEEDFS_MIXER_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-mixer-devel = $(FEEDFS_MIXER_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-mixer-run = $(FEEDFS_MIXER_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-mixer-devel = $(FEEDFS_MIXER_VERSION) PREREQ_BUILD += feedfs-dsp INCLUDE += -I$(FEEDFS_MIXER_DIR)/include LIBFLAGS += -L$(FEEDFS_MIXER_DIR)/lib -lfeedfs-mixer @@ -63,8 +63,8 @@ endif ifneq ($(filter feedfs-dsp,$(PREREQ_BUILD)),) FEEDFS_DSP_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-dsp /opt/$(FLAVOUR_PATH_PREFIX)feedfs-dsp)) FEEDFS_DSP_VERSION = $(call version,$(FEEDFS_DSP_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-dsp-run = $(FEEDFS_DSP_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-dsp-devel = $(FEEDFS_DSP_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-dsp-run = $(FEEDFS_DSP_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-dsp-devel = $(FEEDFS_DSP_VERSION) PREREQ_BUILD += feedfs-objects feedfs-circuit devnet INCLUDE += -I$(FEEDFS_DSP_DIR)/include LIBFLAGS += -L$(FEEDFS_DSP_DIR)/lib -lfeedfs-dsp @@ -75,7 +75,7 @@ endif ifneq ($(filter site,$(PREREQ_BUILD)),) SITE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/site /opt/$(FLAVOUR_PATH_PREFIX)site)) SITE_VERSION = $(call version,$(SITE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)site-devel = $(SITE_VERSION) PREREQ_BUILD += ytools #INCLUDE += -I$(SITE_DIR)/include @@ -87,8 +87,8 @@ endif ifneq ($(filter jux2,$(PREREQ_BUILD)),) JUX2_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux2 /opt/$(FLAVOUR_PATH_PREFIX)jux2)) JUX2_VERSION = $(call version,$(JUX2_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs-objects @@ -105,8 +105,8 @@ endif ifneq ($(filter jux,$(PREREQ_BUILD)),) JUX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux /opt/$(FLAVOUR_PATH_PREFIX)jux)) JUX_VERSION = $(call version,$(JUX_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs-objects @@ -124,8 +124,8 @@ endif ifneq ($(filter jux-client-java,$(PREREQ_BUILD)),) JUX_CLIENT_JAVA_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-client-java /opt/$(FLAVOUR_PATH_PREFIX)jux-client-java)) JUX_CLIENT_JAVA_VERSION = $(call version,$(JUX_CLIENT_JAVA_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-java-run = $(JUX_CLIENT_JAVA_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-client-java-devel = $(JUX_CLIENT_JAVA_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-java-run = $(JUX_CLIENT_JAVA_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-client-java-devel = $(JUX_CLIENT_JAVA_VERSION) PREREQ_BUILD += jux-client LIBFLAGS += -L$(JUX_CLIENT_JAVA_DIR)/lib -ljux-client-java PREREQ += JUX_CLIENT_JAVA @@ -134,8 +134,8 @@ endif ifneq ($(filter jux-client,$(PREREQ_BUILD)),) JUX_CLIENT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-client /opt/$(FLAVOUR_PATH_PREFIX)jux-client)) JUX_CLIENT_VERSION = $(call version,$(JUX_CLIENT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-run = $(JUX_CLIENT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-client-devel = $(JUX_CLIENT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-client-run = $(JUX_CLIENT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-client-devel = $(JUX_CLIENT_VERSION) PREREQ_BUILD += feedfs-net PREREQ_BUILD += jux-shared INCLUDE += -I$(JUX_CLIENT_DIR)/include @@ -147,8 +147,8 @@ endif ifneq ($(filter jux-shared,$(PREREQ_BUILD)),) JUX_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-shared /opt/$(FLAVOUR_PATH_PREFIX)jux-shared)) JUX_SHARED_VERSION = $(call version,$(JUX_SHARED_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-shared-devel = $(JUX_SHARED_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-shared-devel = $(JUX_SHARED_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs-objects @@ -162,8 +162,8 @@ endif ifneq ($(filter ccasfs,$(PREREQ_BUILD)),) CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs)) CCASFS_VERSION = $(call version,$(CCASFS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)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) PREREQ_BUILD += ytools PREREQ_BUILD += cconsole INCLUDE += -I$(CCASFS_DIR)/include @@ -175,8 +175,8 @@ endif ifneq ($(filter cconsole,$(PREREQ_BUILD)),) CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/$(FLAVOUR_PATH_PREFIX)dspider/cconsole)) CCONSOLE_VERSION = $(call version,$(CCONSOLE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)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) INCLUDE += -I$(CCONSOLE_DIR)/include ifeq ($(DEVELOPMENT),true) LIBFLAGS += -L$(CCONSOLE_DIR)/lib @@ -194,8 +194,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 version,$(DSPCD_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)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) PREREQ_BUILD += ytools PREREQ_BUILD += dspider-shared PREREQ_BUILD += userver @@ -209,8 +209,8 @@ DSPCD_EC_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsp DSPCD_EC_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-ec $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider)) # include $(DSPCD_DIR)/make/public.mk DSPIDER_DSPCD_EC_VERSION = $(call version,$(DSPCD_EC_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-ec-run = $(DSPIDER_DSPCD_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-ec-devel = $(DSPIDER_DSPCD_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-ec-run = $(DSPIDER_DSPCD_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-ec-devel = $(DSPIDER_DSPCD_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += dspider-shared-ec PREREQ_BUILD += userver xchange @@ -223,8 +223,8 @@ ifneq ($(filter dsprout,$(PREREQ_BUILD)),) 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 version,$(DSPROUT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += dspider-shared PREREQ_BUILD += userver @@ -239,8 +239,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 version,$(DSPIDER_SHARED_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)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) PREREQ_BUILD += ytools INCLUDE += -I$(DSPIDER_SHARED_DIR)/include LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared @@ -253,8 +253,8 @@ DSPIDER_SHARED_EC_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/sha DSPIDER_SHARED_EC_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared-ec $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider)) include $(DSPIDER_SHARED_EC_DIR)/make/public.mk DSPIDER_SHARED_EC_VERSION = $(call version,$(DSPIDER_SHARED_EC_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-ec-devel = $(DSPIDER_SHARED_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-ec-devel = $(DSPIDER_SHARED_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(DSPIDER_SHARED_EC_DIR)/include LIBFLAGS += -L$(DSPIDER_SHARED_EC_EXE_PREFIX)/lib -ldspider-shared-ec @@ -265,8 +265,8 @@ endif ifneq ($(filter feedfs-qt,$(PREREQ_BUILD)),) FEEDFS_QT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-qt /opt/$(FLAVOUR_PATH_PREFIX)feedfs-qt)) FEEDFS_QT_VERSION = $(call version,$(FEEDFS_QT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-qt-run = $(FEEDFS_QT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-qt-devel = $(FEEDFS_QT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-qt-run = $(FEEDFS_QT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-qt-devel = $(FEEDFS_QT_VERSION) PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs PREREQ_BUILD += ytools @@ -279,8 +279,8 @@ endif ifneq ($(filter feedfs-wt,$(PREREQ_BUILD)),) FEEDFS_WT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-wt /opt/$(FLAVOUR_PATH_PREFIX)feedfs-wt)) FEEDFS_WT_VERSION = $(call version,$(FEEDFS_WT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-wt-run = $(FEEDFS_WT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-wt-devel = $(FEEDFS_WT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-wt-run = $(FEEDFS_WT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-wt-devel = $(FEEDFS_WT_VERSION) PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs PREREQ_BUILD += ytools @@ -296,8 +296,8 @@ endif ifneq ($(filter feedfs-circuit-wt,$(PREREQ_BUILD)),) FEEDFS_CIRCUIT_WT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-circuit-wt /opt/$(FLAVOUR_PATH_PREFIX)feedfs-circuit-wt)) FEEDFS_CIRCUIT_WT_VERSION = $(call version,$(FEEDFS_CIRCUIT_WT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-circuit-wt-run = $(FEEDFS_CIRCUIT_WT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-circuit-wt-devel = $(FEEDFS_CIRCUIT_WT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-circuit-wt-run = $(FEEDFS_CIRCUIT_WT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-circuit-wt-devel = $(FEEDFS_CIRCUIT_WT_VERSION) PREREQ_BUILD += feedfs-wt INCLUDE += -I$(FEEDFS_CIRCUIT_WT_DIR)/include LIBFLAGS += -L$(FEEDFS_CIRCUIT_WT_DIR)/lib # -lfeedfs-circuit-wt @@ -308,8 +308,8 @@ endif ifneq ($(filter feedfs-gui,$(PREREQ_BUILD)),) FEEDFS_GUI_DIR ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-gui /opt/$(FLAVOUR_PATH_PREFIX)feedfs-gui)) FEEDFS_GUI_VERSION = $(call version,$(FEEDFS_GUI_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION) PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-objects INCLUDE += -I$(FEEDFS_GUI_DIR)/include @@ -321,8 +321,8 @@ endif ifneq ($(filter feedfs-bz,$(PREREQ_BUILD)),) FEEDFS_BZ_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-bz /opt/$(FLAVOUR_PATH_PREFIX)feedfs-bz)) FEEDFS_BZ_VERSION = $(call version,$(FEEDFS_BZ_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-bz-run = $(FEEDFS_BZ_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-bz-devel = $(FEEDFS_BZ_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-bz-run = $(FEEDFS_BZ_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-bz-devel = $(FEEDFS_BZ_VERSION) PREREQ_BUILD += feedfs-objects INCLUDE += -I$(FEEDFS_BZ_DIR)/include LIBFLAGS += -L$(FEEDFS_BZ_DIR)/lib -lfeedfs-bz @@ -333,8 +333,8 @@ endif ifneq ($(filter feedfsd,$(PREREQ_BUILD)),) FEEDFSD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfsd /opt/$(FLAVOUR_PATH_PREFIX)feedfsd)) FEEDFSD_VERSION = $(call version,$(FEEDFSD_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfsd-run = $(FEEDFSD_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfsd-devel = $(FEEDFSD_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfsd-run = $(FEEDFSD_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfsd-devel = $(FEEDFSD_VERSION) PREREQ_BUILD += feedfs PREREQ_BUILD += ytools INCLUDE += -I$(FEEDFSD_DIR)/include @@ -346,8 +346,8 @@ endif ifneq ($(filter feedfs-ldap,$(PREREQ_BUILD)),) FEEDFS_LDAP_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-ldap /opt/$(FLAVOUR_PATH_PREFIX)feedfs-ldap)) FEEDFS_LDAP_VERSION = $(call version,$(FEEDFS_LDAP_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ldap-run = $(FEEDFS_LDAP_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ldap-devel = $(FEEDFS_LDAP_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ldap-run = $(FEEDFS_LDAP_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ldap-devel = $(FEEDFS_LDAP_VERSION) PREREQ_BUILD += feedfs PREREQ_BUILD += ytools INCLUDE += -I$(FEEDFS_LDAP_DIR)/include @@ -359,8 +359,8 @@ endif ifneq ($(filter feedfs-utils,$(PREREQ_BUILD)),) FEEDFS_UTILS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-utils /opt/$(FLAVOUR_PATH_PREFIX)feedfs-utils)) FEEDFS_UTILS_VERSION = $(call 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) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-utils-run = $(FEEDFS_UTILS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION) PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs PREREQ_BUILD += ytools @@ -373,8 +373,8 @@ endif ifneq ($(filter feedfs-net,$(PREREQ_BUILD)),) FEEDFS_NET_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-net /opt/$(FLAVOUR_PATH_PREFIX)feedfs-net)) 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) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-net-run = $(FEEDFS_NET_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-net-devel = $(FEEDFS_NET_VERSION) PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-utils PREREQ_BUILD += xchange @@ -389,8 +389,8 @@ endif ifneq ($(filter feedfs-parport,$(PREREQ_BUILD)),) FEEDFS_PARPORT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-parport /opt/$(FLAVOUR_PATH_PREFIX)feedfs-parport)) FEEDFS_PARPORT_VERSION = $(call version,$(FEEDFS_PARPORT_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-parport-run = $(FEEDFS_PARPORT_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-parport-devel = $(FEEDFS_PARPORT_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-parport-run = $(FEEDFS_PARPORT_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-parport-devel = $(FEEDFS_PARPORT_VERSION) PREREQ_BUILD += feedfs-objects PREREQ_BUILD += ytools INCLUDE += -I$(FEEDFS_PARPORT_DIR)/include @@ -402,8 +402,8 @@ 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) +#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 @@ -415,8 +415,8 @@ 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)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ini-run = $(FEEDFS_INI_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ini-devel = $(FEEDFS_INI_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ini-run = $(FEEDFS_INI_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ini-devel = $(FEEDFS_INI_VERSION) PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-utils PREREQ_BUILD += ytools @@ -429,8 +429,8 @@ endif ifneq ($(filter feedfs-local,$(PREREQ_BUILD)),) FEEDFS_LOCAL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-local /opt/$(FLAVOUR_PATH_PREFIX)feedfs-local)) FEEDFS_LOCAL_VERSION = $(call version,$(FEEDFS_LOCAL_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-local-run = $(FEEDFS_LOCAL_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-local-devel = $(FEEDFS_LOCAL_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-local-run = $(FEEDFS_LOCAL_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-local-devel = $(FEEDFS_LOCAL_VERSION) PREREQ_BUILD += feedfs # no build-time linkage necessary, no headers exported LD_LIB_PATH += $(FEEDFS_LOCAL_DIR)/lib @@ -441,8 +441,8 @@ endif ifneq ($(filter feedfs-rewrite,$(PREREQ_BUILD)),) FEEDFS_REWRITE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-rewrite /opt/$(FLAVOUR_PATH_PREFIX)feedfs-rewrite)) FEEDFS_REWRITE_VERSION = $(call version,$(FEEDFS_REWRITE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-rewrite-run = $(FEEDFS_REWRITE_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-rewrite-devel = $(FEEDFS_REWRITE_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-rewrite-run = $(FEEDFS_REWRITE_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-rewrite-devel = $(FEEDFS_REWRITE_VERSION) PREREQ_BUILD += feedfs LD_LIB_PATH += $(FEEDFS_REWRITE_DIR)/lib EXE_SEARCH_PATH += $(FEEDFS_REWRITE_DIR)/bin @@ -455,8 +455,8 @@ endif ifneq ($(filter feedfs-fmemfs,$(PREREQ_BUILD)),) FEEDFS_FMEMFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-fmemfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs-fmemfs)) FEEDFS_FMEMFS_VERSION = $(call version,$(FEEDFS_FMEMFS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-fmemfs-run = $(FEEDFS_FMEMFS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-fmemfs-devel = $(FEEDFS_FMEMFS_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-fmemfs-run = $(FEEDFS_FMEMFS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-fmemfs-devel = $(FEEDFS_FMEMFS_VERSION) PREREQ_BUILD += feedfs # no build-time linkage necessary, no headers exported LD_LIB_PATH += $(FEEDFS_FMEMFS_DIR)/lib @@ -469,8 +469,8 @@ endif ifneq ($(filter feedfs-syslog,$(PREREQ_BUILD)),) FEEDFS_SYSLOG_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-syslog /opt/$(FLAVOUR_PATH_PREFIX)feedfs-syslog)) FEEDFS_SYSLOG_VERSION = $(call version,$(FEEDFS_SYSLOG_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-syslog-run = $(FEEDFS_SYSLOG_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-syslog-devel = $(FEEDFS_SYSLOG_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-syslog-run = $(FEEDFS_SYSLOG_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-syslog-devel = $(FEEDFS_SYSLOG_VERSION) PREREQ_BUILD += feedfs # no build-time linkage necessary, no headers exported LD_LIB_PATH += $(FEEDFS_SYSLOG_DIR)/lib @@ -483,8 +483,8 @@ endif ifneq ($(filter feedfs-objects,$(PREREQ_BUILD)),) FEEDFS_OBJECTS_DIR ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects)) FEEDFS_OBJECTS_VERSION = $(call version,$(FEEDFS_OBJECTS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION) PREREQ_BUILD += feedfs PREREQ_BUILD += ytools INCLUDE += -I$(FEEDFS_OBJECTS_DIR)/include @@ -496,8 +496,8 @@ endif ifneq ($(filter feedfs,$(PREREQ_BUILD)),) FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs)) FEEDFS_VERSION = $(call version,$(FEEDFS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += valdi PREREQ_BUILD += auth @@ -510,8 +510,8 @@ endif ifneq ($(filter userver,$(PREREQ_BUILD)),) USERVER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/$(FLAVOUR_PATH_PREFIX)userver)) USERVER_VERSION = $(call version,$(USERVER_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION) PREREQ_BUILD += xchange PREREQ_BUILD += ytools INCLUDE += -I$(USERVER_DIR)/include @@ -523,8 +523,8 @@ endif ifneq ($(filter xchange-shell,$(PREREQ_BUILD)),) XCHANGE_SHELL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange-shell /opt/$(FLAVOUR_PATH_PREFIX)xchange-shell)) XCHANGE_SHELL_VERSION = $(call version,$(XCHANGE_SHELL_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-shell-run = $(XCHANGE_SHELL_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-shell-devel = $(XCHANGE_SHELL_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-shell-run = $(XCHANGE_SHELL_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-shell-devel = $(XCHANGE_SHELL_VERSION) PREREQ_BUILD += xchange shell INCLUDE += -I$(XCHANGE_SHELL_DIR)/include LIBFLAGS += -L$(XCHANGE_SHELL_DIR)/lib -lxchange-shell @@ -535,8 +535,8 @@ endif ifneq ($(filter xchange-pcap,$(PREREQ_BUILD)),) XCHANGE_PCAP_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange-pcap /opt/$(FLAVOUR_PATH_PREFIX)xchange-pcap)) XCHANGE_PCAP_VERSION = $(call version,$(XCHANGE_PCAP_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-pcap-run = $(XCHANGE_PCAP_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-pcap-devel = $(XCHANGE_PCAP_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-pcap-run = $(XCHANGE_PCAP_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-pcap-devel = $(XCHANGE_PCAP_VERSION) PREREQ_BUILD += xchange INCLUDE += -I$(XCHANGE_PCAP_DIR)/include #LIBFLAGS += -L$(XCHANGE_PCAP_DIR)/lib -lxchange-pcap @@ -548,8 +548,8 @@ endif ifneq ($(filter xchange,$(PREREQ_BUILD)),) XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/$(FLAVOUR_PATH_PREFIX)xchange)) XCHANGE_VERSION = $(call version,$(XCHANGE_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += valdi INCLUDE += -I$(XCHANGE_DIR)/include @@ -561,8 +561,8 @@ endif ifneq ($(filter ntv2,$(PREREQ_BUILD)),) NTV2_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ntv2 /opt/$(FLAVOUR_PATH_PREFIX)ntv2)) NTV2_VERSION = $(call version,$(NTV2_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ntv2-run = $(NTV2_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ntv2-devel = $(NTV2_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ntv2-run = $(NTV2_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ntv2-devel = $(NTV2_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(NTV2_DIR)/include LIBFLAGS += -L$(NTV2_DIR)/lib -lntv2 @@ -573,8 +573,8 @@ endif ifneq ($(filter btools,$(PREREQ_BUILD)),) BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/$(FLAVOUR_PATH_PREFIX)dspider-btools)) BTOOLS_VERSION = $(call version,$(BTOOLS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)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) PREREQ_BUILD += ytools INCLUDE += -I$(BTOOLS_DIR)/include LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools @@ -585,8 +585,8 @@ endif ifneq ($(filter jackjart,$(PREREQ_BUILD)),) JACKJART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackjart /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackjart)) JACKJART_VERSION = $(call version,$(JACKJART_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(JACKJART_DIR)/include LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart @@ -597,8 +597,8 @@ endif ifneq ($(filter jackrtai,$(PREREQ_BUILD)),) JACKRTAI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackrtai /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackrtai)) JACKRTAI_VERSION = $(call version,$(JACKRTAI_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(JACKRTAI_DIR)/include LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai @@ -609,8 +609,8 @@ endif ifneq ($(filter jackdummy,$(PREREQ_BUILD)),) JACKDUMMY_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackdummy /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackdummy)) JACKDUMMY_VERSION = $(call version,$(JACKDUMMY_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackdummy-run = $(JACKDUMMY_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackdummy-run = $(JACKDUMMY_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(JACKDUMMY_DIR)/include LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy @@ -621,8 +621,8 @@ endif ifneq ($(filter alsart,$(PREREQ_BUILD)),) ALSART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/alsart /opt/$(FLAVOUR_PATH_PREFIX)dspider/alsart)) ALSART_VERSION = $(call version,$(ALSART_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(ALSART_DIR)/include LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart @@ -633,8 +633,8 @@ endif ifneq ($(filter jackmix,$(PREREQ_BUILD)),) JACKMIX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-plugins/jackmix /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackmix)) JACKMIX_VERSION = $(call version,$(JACKMIX_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackmix-run = $(JACKMIX_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackmix-devel = $(JACKMIX_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackmix-run = $(JACKMIX_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackmix-devel = $(JACKMIX_VERSION) PREREQ_BUILD += ytools btools INCLUDE += -I$(JACKMIX_DIR)/include LIBFLAGS += -L$(JACKMIX_DIR)/lib -ldspider-jackmix @@ -646,8 +646,8 @@ endif ifneq ($(filter scmjm,$(PREREQ_BUILD)),) SCMJM_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-plugins/scmjm /opt/$(FLAVOUR_PATH_PREFIX)dspider/scmjm)) SCMJM_VERSION = $(call version,$(SCMJM_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scmjm-run = $(SCMJM_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scmjm-devel = $(SCMJM_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scmjm-run = $(SCMJM_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scmjm-devel = $(SCMJM_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(SCMJM_DIR)/include LIBFLAGS += -L$(SCMJM_DIR)/lib -ldspider-scmjm @@ -659,8 +659,8 @@ endif ifneq ($(filter scm,$(PREREQ_BUILD)),) SCM_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd-plugins/scm /opt/$(FLAVOUR_PATH_PREFIX)dspider/scm)) SCM_VERSION = $(call version,$(SCM_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scm-run = $(SCM_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scm-devel = $(SCM_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scm-run = $(SCM_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scm-devel = $(SCM_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(SCM_DIR)/include LIBFLAGS += -L$(SCM_DIR)/lib -ldspider-scm @@ -671,8 +671,8 @@ endif ifneq ($(filter dspfs,$(PREREQ_BUILD)),) DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$(FLAVOUR_PATH_PREFIX)dspfs)) DSPFS_VERSION = $(call version,$(DSPFS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(DSPFS_DIR)/include LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs @@ -683,8 +683,8 @@ endif ifneq ($(filter auth,$(PREREQ_BUILD)),) 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) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)auth-run = $(AUTH_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)auth-devel = $(AUTH_VERSION) PREREQ_BUILD += ytools PREREQ_BUILD += valdi INCLUDE += -I$(AUTH_DIR)/include @@ -696,8 +696,8 @@ endif ifneq ($(filter emscren-v8,$(PREREQ_BUILD)),) EMSCREN_V8_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/emscren-v8 /opt/$(FLAVOUR_PATH_PREFIX)emscren-v8)) EMSCREN_V8_VERSION = $(call version,$(EMSCREN_V8_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-v8-run = $(EMSCREN_V8_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-v8-devel = $(EMSCREN_V8_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-v8-run = $(EMSCREN_V8_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-v8-devel = $(EMSCREN_V8_VERSION) PREREQ_BUILD += ytools #INCLUDE += -I$(EMSCREN_V8_DIR)/include LIBFLAGS += -L$(EMSCREN_V8_DIR)/lib @@ -709,8 +709,8 @@ endif ifneq ($(filter emscren,$(PREREQ_BUILD)),) EMSCREN_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/emscren /opt/$(FLAVOUR_PATH_PREFIX)emscren)) EMSCREN_VERSION = $(call version,$(EMSCREN_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-run = $(EMSCREN_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-devel = $(EMSCREN_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-run = $(EMSCREN_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-devel = $(EMSCREN_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(EMSCREN_DIR)/include LIBFLAGS += -L$(EMSCREN_DIR)/lib @@ -722,8 +722,8 @@ endif ifneq ($(filter valdi,$(PREREQ_BUILD)),) 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) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION) PREREQ_BUILD += ytools #INCLUDE += -I$(VALDI_DIR)/include LIBFLAGS += -L$(VALDI_DIR)/lib @@ -735,8 +735,8 @@ endif ifneq ($(filter feedfs-cmd,$(PREREQ_BUILD)),) FEEDFS_CMD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-cmd /opt/$(FLAVOUR_PATH_PREFIX)feedfs-cmd)) FEEDFS_CMD_VERSION = $(call version,$(FEEDFS_CMD_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-cmd-run = $(FEEDFS_CMD_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-cmd-devel = $(FEEDFS_CMD_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-cmd-run = $(FEEDFS_CMD_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-cmd-devel = $(FEEDFS_CMD_VERSION) PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-utils PREREQ_BUILD += ytools @@ -750,8 +750,8 @@ endif ifneq ($(filter shell,$(PREREQ_BUILD)),) SHELL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/shell /opt/$(FLAVOUR_PATH_PREFIX)shell)) SHELL_VERSION = $(call version,$(SHELL_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)shell-run = $(SHELL_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)shell-devel = $(SHELL_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)shell-run = $(SHELL_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)shell-devel = $(SHELL_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(SHELL_DIR)/include LIBFLAGS += -L$(SHELL_DIR)/lib -lshell @@ -764,8 +764,8 @@ USE_WT = true include $(MODDIR)/make/wt-defs.mk WT_JANNET_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/wt-jannet /opt/$(FLAVOUR_PATH_PREFIX)wt-jannet)) WT_JANNET_VERSION = $(call version,$(WT_JANNET_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)wt-jannet-run = $(WT_JANNET_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)wt-jannet-devel = $(WT_JANNET_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)wt-jannet-run = $(WT_JANNET_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)wt-jannet-devel = $(WT_JANNET_VERSION) PREREQ_BUILD += feedfs INCLUDE += -I$(WT_JANNET_DIR)/include LD_LIB_PATH += $(WT_JANNET_DIR)/lib @@ -778,8 +778,8 @@ endif ifneq ($(filter apache2-jannet,$(PREREQ_BUILD)),) APACHE2_JANNET_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/apache2-jannet /opt/$(FLAVOUR_PATH_PREFIX)apache2-jannet)) APACHE2_JANNET_VERSION = $(call version,$(APACHE2_JANNET_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)apache2-jannet-run = $(APACHE2_JANNET_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)apache2-jannet-devel = $(APACHE2_JANNET_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)apache2-jannet-run = $(APACHE2_JANNET_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)apache2-jannet-devel = $(APACHE2_JANNET_VERSION) PREREQ_BUILD += feedfs # no build-time linkage necessary, no headers exported LD_LIB_PATH += $(APACHE2_JANNET_DIR)/lib @@ -790,8 +790,8 @@ endif ifneq ($(filter fptest,$(PREREQ_BUILD)),) FPTEST_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/fptest /opt/$(FLAVOUR_PATH_PREFIX)fptest)) FPTEST_VERSION = $(call version,$(FPTEST_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(FPTEST_DIR)/include LIBFLAGS += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit @@ -802,8 +802,8 @@ endif ifneq ($(filter fpanel,$(PREREQ_BUILD)),) FPANEL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/fpanel /opt/$(FLAVOUR_PATH_PREFIX)fpanel)) FPANEL_VERSION = $(call version,$(FPANEL_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fpanel-run = $(FPANEL_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fpanel-devel = $(FPANEL_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fpanel-run = $(FPANEL_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fpanel-devel = $(FPANEL_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(FPANEL_DIR)/include LIBFLAGS += -L$(FPANEL_DIR)/lib -lfpanel -L$(HOME)/opt/iowkit/lib -liowkit @@ -814,8 +814,8 @@ endif ifneq ($(filter devnet,$(PREREQ_BUILD)),) DEVNET_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/devnet /opt/$(FLAVOUR_PATH_PREFIX)devnet)) DEVNET_VERSION = $(call version,$(DEVNET_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)devnet-run = $(DEVNET_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)devnet-devel = $(DEVNET_VERSION) +#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)devnet-run = $(DEVNET_VERSION) +#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)devnet-devel = $(DEVNET_VERSION) PREREQ_BUILD += ytools INCLUDE += -I$(DEVNET_DIR)/include LIBFLAGS += -L$(DEVNET_DIR)/lib -ldevnet @@ -844,8 +844,8 @@ endif ifeq ($(USE_SCOPE_CASMIX),true) SCOPE_CASMIX_DIR = /opt/scope-casmix SCOPE_CASMIX_VERSION = $(call version,/usr/share/doc/packages/scope-casmix-devel) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)scope-casmix >= $(SCOPE_CASMIX_VERSION) -RPM_REQUIRES_DEVEL += scope-casmix-devel >= $(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 EXE_SEARCH_PATH += $(SCOPE_CASMIX_DIR)/bin