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: Renamed dsptools to devnet

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-10-01 16:20:21 +00:00
commit e8b1ed3c0c
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/defs.mk
View file

@ -946,7 +946,7 @@ XCHANGE_NEXUS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange-nexu
XCHANGE_NEXUS_VERSION = $(call version,$(XCHANGE_NEXUS_DIR)) XCHANGE_NEXUS_VERSION = $(call version,$(XCHANGE_NEXUS_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-nexus-run = $(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) 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 INCLUDE += -I$(XCHANGE_NEXUS_DIR)/include
LIBFLAGS += -L$(XCHANGE_NEXUS_DIR)/lib -lxchange-nexus LIBFLAGS += -L$(XCHANGE_NEXUS_DIR)/lib -lxchange-nexus
EXE_SEARCH_PATH += $(XCHANGE_NEXUS_DIR)/bin 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)) FEEDFS_DSP_VERSION = $(call version,$(FEEDFS_DSP_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-dsp-run = $(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) 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 INCLUDE += -I$(FEEDFS_DSP_DIR)/include
LIBFLAGS += -L$(FEEDFS_DSP_DIR)/lib -lfeedfs-dsp LIBFLAGS += -L$(FEEDFS_DSP_DIR)/lib -lfeedfs-dsp
EXE_SEARCH_PATH += $(FEEDFS_DSP_DIR)/bin EXE_SEARCH_PATH += $(FEEDFS_DSP_DIR)/bin
@ -1690,16 +1690,16 @@ EXE_SEARCH_PATH += $(FPANEL_DIR)/bin
PREREQ += FPANEL PREREQ += FPANEL
endif endif
ifneq ($(filter dsptools,$(PREREQ_BUILD)),) ifneq ($(filter devnet,$(PREREQ_BUILD)),)
DSPTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dsptools /opt/$(FLAVOUR_PATH_PREFIX)dsptools)) DEVNET_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/devnet /opt/$(FLAVOUR_PATH_PREFIX)devnet))
DSPTOOLS_VERSION = $(call version,$(DSPTOOLS_DIR)) DEVNET_VERSION = $(call version,$(DEVNET_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsptools-run = $(DSPTOOLS_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)devnet-run = $(DEVNET_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsptools-devel = $(DSPTOOLS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)devnet-devel = $(DEVNET_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += ytools
INCLUDE += -I$(DSPTOOLS_DIR)/include INCLUDE += -I$(DEVNET_DIR)/include
LIBFLAGS += -L$(DSPTOOLS_DIR)/lib -ldsptools LIBFLAGS += -L$(DEVNET_DIR)/lib -ldevnet
EXE_SEARCH_PATH += $(DSPTOOLS_DIR)/bin EXE_SEARCH_PATH += $(DEVNET_DIR)/bin
PREREQ += DSPTOOLS PREREQ += DEVNET
endif endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),) ifneq ($(filter ytools,$(PREREQ_BUILD)),)