From fede17cb6e4bf420173f79f597711687be38410d Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Mon, 29 Jun 2009 14:56:46 +0000
Subject: [PATCH] defs.mk: Add USE_FEEDFS_LOCAL

- Add support for USE_FEEDFS_LOCAL
- Move generation of LD_LIBRARY_PATH into ldlibpath.mk exclusively
---
 make/defs.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 37b8b15b..9d18b615 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -55,7 +55,6 @@ LOCAL_DIST_WINVERSION  = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
 MAJOR_MINOR_RELEASE    = $(shell echo $(DIST_VERSION) | cut -d- -f1)
 BUILD_NUMBER           = $(shell echo $(DIST_VERSION) | cut -d- -f2)
 CVS_RSH               ?= /usr/bin/ssh
-LD_LIBRARY_PATH_ENV   := $(LD_LIBRARY_PATH)
 ifneq ($(TARGET),mingw)
 EXE                   ?= $(EXE_BASENAME)
 else
@@ -125,7 +124,6 @@ OPTS_PID_FILE         ?= $(PIDDIR)/$(PROJECT).pid
 
 CFLAGS                += -DVERSION=$(HEX_VERSION)
 CPPFLAGS              += -DVERSION=$(HEX_VERSION)
-LD_LIB_PATH           += $(MODDIR)/lib
 
 ifeq ($(TARGET),mingw)
 CROSS_TOOL_DIR        ?= /opt/cross-tools
@@ -531,7 +529,6 @@ CPP                    = $(GPP)
 
 ifeq ($(USE_PROJECT_LIB),true)
 	PROJECTLIB_LDFLAGS    += -l$(LIBNAME) -L$(TOPDIR)/lib
-	LD_LIB_PATH           += $(TOPDIR)/lib
 endif
 
 ifeq ($(USE_YTOOLS),true)
@@ -786,6 +783,16 @@ INCLUDE                   += -I$(FEEDFS_NET_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
 endif
 
+ifeq ($(USE_FEEDFS_LOCAL),true)
+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)
+USE_FEEDFS                 = true
+# no build-time linkage necessary, no headers exported
+LD_LIB_PATH               += $(FEEDFS_LOCAL_DIR)/lib
+endif
+
 ifeq ($(USE_FEEDFS_OBJECTS),true)
 FEEDFS_OBJECTS_DIR         = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-objects /opt/$(FLAVOUR_PATH_PREFIX)feedfs-objects))
 FEEDFS_OBJECTS_VERSION     = $(call version,$(FEEDFS_OBJECTS_DIR))
@@ -969,6 +976,5 @@ CPPFLAGS                  += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS)  $(INCLUDE)
 LDFLAGS                   += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
 #RPM_REQUIRES               = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
 RPM_REQUIRES              += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)
-NEW_LD_LIB_PATH            = $(shell echo $(LDFLAGS) | sed 's/^-[^L] *[^ ]*/ /g; s/[ 	]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
 
 endif