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: Add LOCAL_LIBS

Browse source 
Add the variable LOCAL_LIBS

TODO: use something like this as unifying variable, there are far too
many lib-related variables.
This commit is contained in:
Jan Lindemann 2007-09-04 20:37:03 +00:00 • committed by Jan Lindemann
commit 5ce3eec1d7
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/defs.mk
View file

@ -215,10 +215,13 @@ BUILD_LIBDIR = $(TOPDIR)/lib
LIBNAME ?= $(PROJECT) LIBNAME ?= $(PROJECT)
LIBTYPE ?= shared LIBTYPE ?= shared
MEMBERS += $(LIB_A)($(OBJ)) MEMBERS += $(LIB_A)($(OBJ))
SHOBJS += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(SRC_ALL_CPP))))
INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib INSTALL_LIBDIR ?= $(EXE_PREFIX)/lib
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
# TODO: use something like this as unifying variable, there are far too many
# lib-related variables
LOCAL_LIBS +=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
SHOBJS += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(SRC_ALL_CPP))))
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1) SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1)
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
@ -236,9 +239,11 @@ LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/$(LIBNAME).$(SO_SUFFIX) INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/$(LIBNAME).$(SO_SUFFIX)
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
endif endif
INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS))
INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \
$(INSTALLED_DEF) $(INSTALLED_DEF)
BUILD_LIB += $(LIB_SO) BUILD_LIB += $(LIB_SO)