From 565a432691adcdbd8dd7b7512009b217c960591a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 27 Jun 2009 16:22:18 +0000
Subject: [PATCH] defs.mk: Add support for USE_FEEDFS_OBJECTS

---
 make/defs.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/make/defs.mk b/make/defs.mk
index b07d42c0..f12c2754 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -268,9 +268,10 @@ VERSION_SCRIPT         = $(BUILD_LIBDIR)/version.ldscript
 #       lib-related variables
 LOCAL_LIBS            +=
 ifneq ($(TARGET),mingw)
-SHOBJS                += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(SRC_ALL_CPP))))
+SHOBJS                += $(patsubst %.cpp,$(SO_PREFIX)%.so,$(patsubst %.cc,$(SO_PREFIX)%.so,$(patsubst %.c,$(SO_PREFIX)%.so,$(SRC_ALL_CPP))))
 LIB_A                  = $(BUILD_LIBDIR)/lib$(LIBNAME).a
 SO_SUFFIX              = so.$(shell echo $(VERSION) | cut -d- -f1)
+SO_PREFIX             ?= lib
 LIB_SO                 = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
 LINKS_SO              += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
 INSTALLED_LINKS_SO    += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
@@ -278,6 +279,7 @@ INSTALLED_LIB_A        = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
 else
 LIB_A                  = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
 SO_SUFFIX              = dll
+SO_PREFIX             ?=
 LIB_DEF                = $(BUILD_LIBDIR)/$(LIBNAME).def
 MSVCPP_IMPLIB          = $(BUILD_LIBDIR)/$(LIBNAME).lib
 LIB_SO                 = $(BUILD_LIBDIR)/$(LIBNAME).dll
@@ -783,6 +785,17 @@ INCLUDE                   += -I$(FEEDFS_NET_DIR)/include
 LIBFLAGS                  += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
 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_UTILS_DIR))
+RPM_REQUIRES_RUN          += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION)
+RPM_REQUIRES_DEVEL        += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION)
+USE_FEEDFS                 = true
+USE_YTOOLS                 = true
+INCLUDE                   += -I$(FEEDFS_OBJECTS_DIR)/include
+LIBFLAGS                  += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects
+endif
+
 ifeq ($(USE_FEEDFS),true)
 FEEDFS_DIR                 = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs))
 FEEDFS_VERSION             = $(call version,$(FEEDFS_DIR))