From ce59d7007fb426617c405d155e68bf683b4e3260 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 20 Nov 2010 16:03:59 +0000 Subject: [PATCH] defs.mk: Add EXE_SEARCH_PATH --- make/defs.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index 6d38d50c..26cf1f3c 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -695,6 +695,7 @@ USE_YTOOLS = true USE_CCONSOLE = true INCLUDE += -I$(CCASFS_DIR)/include #LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole +EXE_SEARCH_PATH += $(CCASFS_DIR)/bin endif ifeq ($(USE_CCONSOLE),true) @@ -710,6 +711,7 @@ else LIBFLAGS += -L$(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)dspider/feedfs/bin endif LIBFLAGS += -ldspider-cconsole +EXE_SEARCH_PATH += $(CCONSOLE_DIR)/bin endif ifeq ($(USE_DSPCD),true) @@ -724,6 +726,7 @@ USE_DSPIDER_SHARED = true USE_USERVER = true INCLUDE += -I$(DSPCD_DIR)/include LIBFLAGS += -L$(DSPCD_EXE_PREFIX)/lib -ldspcd +EXE_SEARCH_PATH += $(DSCD_DIR)/bin endif ifeq ($(USE_DSPROUT),true) @@ -737,6 +740,7 @@ USE_DSPIDER_SHARED = true USE_USERVER = true INCLUDE += -I$(DSPROUT_DIR)/include LIBFLAGS += -L$(DSPROUT_EXE_PREFIX)/lib -ldsprout +EXE_SEARCH_PATH += $(DSPROUT_DIR)/bin endif ifeq ($(USE_DSPIDER_SHARED),true) @@ -749,6 +753,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-devel = $(DSPIDER_S USE_YTOOLS = true INCLUDE += -I$(DSPIDER_SHARED_DIR)/include LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared +EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin endif ifeq ($(USE_FEEDFS_GUI),true) @@ -761,6 +766,7 @@ USE_FEEDFS = true USE_YTOOLS = true INCLUDE += -I$(FEEDFS_GUI_DIR)/include LIBFLAGS += -L$(FEEDFS_GUI_DIR)/lib -lfeedfs-gui +EXE_SEARCH_PATH += $(FEEDFS_GUI_DIR)/bin endif ifeq ($(USE_FEEDFSD),true) @@ -772,6 +778,7 @@ USE_FEEDFS = true USE_YTOOLS = true INCLUDE += -I$(FEEDFSD_DIR)/include LIBFLAGS += -L$(FEEDFSD_DIR)/lib -lfeedfsd +EXE_SEARCH_PATH += $(FEEDFSD_DIR)/bin endif ifeq ($(USE_FEEDFS_LDAP),true) @@ -783,6 +790,7 @@ USE_FEEDFS = true USE_YTOOLS = true INCLUDE += -I$(FEEDFS_LDAP_DIR)/include LIBFLAGS += -L$(FEEDFS_LDAP_DIR)/lib -lfeedfs-ldap -lldap +EXE_SEARCH_PATH += $(FEEDFS_LDAP_DIR)/bin endif ifeq ($(USE_FEEDFS_UTILS),true) @@ -795,6 +803,7 @@ USE_FEEDFS = true USE_YTOOLS = true INCLUDE += -I$(FEEDFS_UTILS_DIR)/include LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils +EXE_SEARCH_PATH += $(FEEDFS_UTILS_DIR)/bin endif ifeq ($(USE_FEEDFS_NET),true) @@ -808,6 +817,7 @@ USE_XCHANGE = true USE_YTOOLS = true INCLUDE += -I$(FEEDFS_NET_DIR)/include LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net +EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin endif ifeq ($(USE_FEEDFS_LOCAL),true) @@ -818,6 +828,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-local-devel = $(FEEDFS_LOCA USE_FEEDFS = true # no build-time linkage necessary, no headers exported LD_LIB_PATH += $(FEEDFS_LOCAL_DIR)/lib +EXE_SEARCH_PATH += $(FEEDFS_LOCAL_DIR)/bin endif ifeq ($(USE_FEEDFS_FMEMFS),true) @@ -830,6 +841,7 @@ USE_FEEDFS = true LD_LIB_PATH += $(FEEDFS_FMEMFS_DIR)/lib INCLUDE += -I$(FEEDFS_FMEMFS_DIR)/include LIBFLAGS += -L$(FEEDFS_FMEMFS_DIR)/lib -lfeedfs-fmemfs +EXE_SEARCH_PATH += $(FEEDFS_FMEMFS_DIR)/bin endif ifeq ($(USE_FEEDFS_SYSLOG),true) @@ -842,6 +854,7 @@ USE_FEEDFS = true LD_LIB_PATH += $(FEEDFS_SYSLOG_DIR)/lib INCLUDE += -I$(FEEDFS_SYSLOG_DIR)/include LIBFLAGS += -L$(FEEDFS_SYSLOG_DIR)/lib -lfeedfs-syslog +EXE_SEARCH_PATH += $(FEEDFS_SYSLOG_DIR)/bin endif ifeq ($(USE_FEEDFS_OBJECTS),true) @@ -853,6 +866,7 @@ USE_FEEDFS = true USE_YTOOLS = true INCLUDE += -I$(FEEDFS_OBJECTS_DIR)/include LIBFLAGS += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects +EXE_SEARCH_PATH += $(FEEDFS_OBJECTS_DIR)/bin endif ifeq ($(USE_FEEDFS),true) @@ -865,6 +879,7 @@ USE_VALDI = true USE_AUTH = true INCLUDE += -I$(FEEDFS_DIR)/include LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs +EXE_SEARCH_PATH += $(FEEDFS_DIR)/bin endif ifeq ($(USE_USERVER),true) @@ -876,6 +891,7 @@ USE_XCHANGE = true USE_YTOOLS = true INCLUDE += -I$(USERVER_DIR)/include LIBFLAGS += -L$(USERVER_DIR)/lib -luserver +EXE_SEARCH_PATH += $(USERVER_DIR)/bin endif ifeq ($(USE_XCHANGE),true) @@ -887,6 +903,7 @@ USE_YTOOLS = true USE_VALDI = true INCLUDE += -I$(XCHANGE_DIR)/include LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange +EXE_SEARCH_PATH += $(XCHANGE_DIR)/bin endif ifeq ($(USE_BTOOLS),true) @@ -897,6 +914,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VE USE_YTOOLS = true INCLUDE += -I$(BTOOLS_DIR)/include LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools +EXE_SEARCH_PATH += $(BTOOLS_DIR)/bin endif ifeq ($(USE_JACKJART),true) @@ -907,6 +925,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSIO USE_YTOOLS = true INCLUDE += -I$(JACKJART_DIR)/include LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart +EXE_SEARCH_PATH += $(JACKJART_DIR)/bin endif ifeq ($(USE_JACKRTAI),true) @@ -917,6 +936,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSIO USE_YTOOLS = true INCLUDE += -I$(JACKRTAI_DIR)/include LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai +EXE_SEARCH_PATH += $(JACKRTAI_DIR)/bin endif ifeq ($(USE_JACKDUMMY),true) @@ -927,6 +947,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackdummy-devel = $(JACKDUMMY_VERS USE_YTOOLS = true INCLUDE += -I$(JACKDUMMY_DIR)/include LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy +EXE_SEARCH_PATH += $(JACKDUMMY_DIR)/bin endif ifeq ($(USE_ALSART),true) @@ -937,6 +958,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION) USE_YTOOLS = true INCLUDE += -I$(ALSART_DIR)/include LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart +EXE_SEARCH_PATH += $(ALSART_DIR)/bin endif ifeq ($(USE_DSPFS),true) @@ -947,6 +969,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION) USE_YTOOLS = true INCLUDE += -I$(DSPFS_DIR)/include LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs +EXE_SEARCH_PATH += $(DSPFS_DIR)/bin endif ifeq ($(USE_AUTH),true) @@ -958,6 +981,7 @@ USE_YTOOLS = true USE_VALDI = true INCLUDE += -I$(AUTH_DIR)/include LIBFLAGS += -L$(AUTH_DIR)/lib -lauth +EXE_SEARCH_PATH += $(AUTH_DIR)/bin endif ifeq ($(USE_VALDI),true) @@ -968,6 +992,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION) USE_YTOOLS = true #INCLUDE += -I$(VALDI_DIR)/include #LIBFLAGS += -L$(VALDI_DIR)/lib -lvaldi +EXE_SEARCH_PATH += $(VALDI_DIR)/bin endif @@ -984,6 +1009,7 @@ RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION) endif INCLUDE += -I$(YTOOLS_DIR)/include LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools +EXE_SEARCH_PATH += $(YTOOLS_DIR)/bin endif ifeq ($(USE_SCOPE_CASMIX),true) @@ -993,6 +1019,7 @@ RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)scope-casmix >= $(SCOPE_CASMIX_VER 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 endif ifeq ($(USE_SNDFILE),true)