From a91e9578d326ab976f8199fd5996ec92e8fcfc29 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 21 May 2017 11:33:09 +0000 Subject: [PATCH] defs.mk: Add missing -L$(TOPDIR)/lib Signed-off-by: Jan Lindemann --- make/defs.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index e48562de..7d353923 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -377,7 +377,8 @@ INSTALLATION_FILE_TYPES += LIB #INSTALL_PIDIR = $(INSTALL_LIBDIR) #INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN)) -BUILD_LIBDIR = $(TOPDIR)/lib +BUILD_LIBDIR = $(TOPDIR)/lib + LOCAL_LIBS += $(CONTRIB_LIBS) $(PLUGIN) ifeq ($(TARGET),mingw) ifeq ($(MINGW_SYS_ROOT),) @@ -417,6 +418,7 @@ MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a endif # mingw +BUILD_LIB += $(LIB_SO) endif # USE_PROJECT_LIB INSTALLED_LIB_SO = $(addprefix $(INSTALL_LIBDIR)/,$(notdir $(LIB_SO))) INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.exp)) @@ -426,7 +428,6 @@ INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_LIB += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) \ $(INSTALLED_DEF) -BUILD_LIB += $(LIB_SO) ## -- PI #BUILD_PIDIR = $(BUILD_LIBDIR) @@ -780,10 +781,8 @@ CPP = $(CLANGPP) LD = $(CLANGPP) endif -PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib - ifeq ($(USE_PROJECT_LIB),true) - PROJECTLIB_LDFLAGS += -l$(LIBNAME) + PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib -l$(LIBNAME) endif ifneq ($(filter jw-build,$(PREREQ_BUILD)),)