From e8b1ed3c0c0be8a23a9e7073cd0ea34a1ef0f6d2 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 1 Oct 2015 16:20:21 +0000 Subject: [PATCH] defs.mk: Renamed dsptools to devnet Signed-off-by: Jan Lindemann --- make/defs.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 47ebe7f9..e0e03703 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -946,7 +946,7 @@ XCHANGE_NEXUS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange-nexu 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) -PREREQ_BUILD += xchange dsptools +PREREQ_BUILD += xchange devnet INCLUDE += -I$(XCHANGE_NEXUS_DIR)/include LIBFLAGS += -L$(XCHANGE_NEXUS_DIR)/lib -lxchange-nexus EXE_SEARCH_PATH += $(XCHANGE_NEXUS_DIR)/bin @@ -970,7 +970,7 @@ FEEDFS_DSP_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-dsp /o 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 dsptools +PREREQ_BUILD += feedfs-objects feedfs-circuit devnet INCLUDE += -I$(FEEDFS_DSP_DIR)/include LIBFLAGS += -L$(FEEDFS_DSP_DIR)/lib -lfeedfs-dsp EXE_SEARCH_PATH += $(FEEDFS_DSP_DIR)/bin @@ -1690,16 +1690,16 @@ EXE_SEARCH_PATH += $(FPANEL_DIR)/bin PREREQ += FPANEL endif -ifneq ($(filter dsptools,$(PREREQ_BUILD)),) -DSPTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dsptools /opt/$(FLAVOUR_PATH_PREFIX)dsptools)) -DSPTOOLS_VERSION = $(call version,$(DSPTOOLS_DIR)) -RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsptools-run = $(DSPTOOLS_VERSION) -RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsptools-devel = $(DSPTOOLS_VERSION) +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) PREREQ_BUILD += ytools -INCLUDE += -I$(DSPTOOLS_DIR)/include -LIBFLAGS += -L$(DSPTOOLS_DIR)/lib -ldsptools -EXE_SEARCH_PATH += $(DSPTOOLS_DIR)/bin -PREREQ += DSPTOOLS +INCLUDE += -I$(DEVNET_DIR)/include +LIBFLAGS += -L$(DEVNET_DIR)/lib -ldevnet +EXE_SEARCH_PATH += $(DEVNET_DIR)/bin +PREREQ += DEVNET endif ifneq ($(filter ytools,$(PREREQ_BUILD)),)