diff --git a/make/defs.mk b/make/defs.mk index 16045482..2d04bee9 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -897,12 +897,24 @@ EXE_SEARCH_PATH += $(XCHANGE_NEXUS_DIR)/bin PREREQ += XCHANGE_NEXUS 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) +PREREQ_BUILD += feedfs-dsp +INCLUDE += -I$(FEEDFS_MIXER_DIR)/include +LIBFLAGS += -L$(FEEDFS_MIXER_DIR)/lib -lfeedfs-mixer +EXE_SEARCH_PATH += $(FEEDFS_MIXER_DIR)/bin +PREREQ += FEEDFS_MIXER +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) -PREREQ_BUILD += feedfs-objects feedfs-circuit +PREREQ_BUILD += feedfs-objects feedfs-circuit dsptools INCLUDE += -I$(FEEDFS_DSP_DIR)/include LIBFLAGS += -L$(FEEDFS_DSP_DIR)/lib -lfeedfs-dsp EXE_SEARCH_PATH += $(FEEDFS_DSP_DIR)/bin