janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 13:17:39 +01:00
Code Activity

fix: CONTRIB_LIBS were copied to build directory, but not installed

Browse source
This commit is contained in:
Jan Lindemann 2009-06-12 19:43:23 +00:00 • committed by Jan Lindemann
commit c3f95cc80c
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/defs.mk
View file

@ -247,6 +247,11 @@ INSTALLED_DOC ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
# -- LIB # -- LIB
BUILD_LIBDIR = $(TOPDIR)/lib BUILD_LIBDIR = $(TOPDIR)/lib
LOCAL_LIBS += $(CONTRIB_LIBS)
ifeq ($(TARGET),mingw)
CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
endif
LIBNAME ?= $(PROJECT) LIBNAME ?= $(PROJECT)
LIBTYPE ?= shared LIBTYPE ?= shared
MEMBERS += $(LIB_A)($(OBJ)) MEMBERS += $(LIB_A)($(OBJ))
@ -262,7 +267,6 @@ 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)
LINKS_SO += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) 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)) INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
@ -270,9 +274,9 @@ SO_SUFFIX = dll
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
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_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO)))
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp))
INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS)) INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS)) BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS))

12
make/lib.mk
View file

@ -33,19 +33,17 @@ ld-%.conf:
clean.ld-conf: clean.ld-conf:
rm -f $(LD_CONF) rm -f $(LD_CONF)
echo.libs:
@echo INSTALLED_LIB_SO = $(INSTALLED_LIB_SO)
@echo INSTALLED_LIB = $(INSTALLED_LIB)
# ------------------------------------------ contrib libraries # ------------------------------------------ contrib libraries
LOCAL_LIBS += $(CONTRIB_LIBS)
ifeq ($(TARGET),mingw)
CONTRIB_LIBS_PATH += $(CROSS_TOOL_DIR)/bin
endif
# deps on mandatory targets # deps on mandatory targets
all: $(CONTRIB_LIBS) all: $(CONTRIB_LIBS)
clean: clean.contrib-libs clean: clean.contrib-libs
# deps on optional targets # deps on optional targets
echo-contrib: echo.contrib-libs echo-contrib: echo.contrib-libs echo.libs
# rules # rules
clean.contrib-libs: clean.contrib-libs: