Bug 1138824 - Simplify installation of import libraries to $(DIST)/lib. r=gps

The recursivemake backend sets IMPORT_LIBRARY to the same value as
SHARED_LIBRARY on non-Windows platforms, so we can simply use
IMPORT_LIBRARY everywhere.
This commit is contained in:
Mike Hommey 2015-03-03 17:18:07 +09:00
parent 47007104f5
commit 1eee44a9d1

View File

@ -48,15 +48,10 @@ SHARED_LIBRARY_DEST ?= $(FINAL_TARGET)
SHARED_LIBRARY_TARGET = target SHARED_LIBRARY_TARGET = target
INSTALL_TARGETS += SHARED_LIBRARY INSTALL_TARGETS += SHARED_LIBRARY
ifneq (,$(filter WINNT,$(OS_ARCH))) ifdef IMPORT_LIBRARY
IMPORT_LIB_FILES = $(IMPORT_LIBRARY) IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
else
IMPORT_LIB_FILES = $(SHARED_LIBRARY)
endif
IMPORT_LIB_DEST ?= $(DIST)/lib IMPORT_LIB_DEST ?= $(DIST)/lib
IMPORT_LIB_TARGET = target IMPORT_LIB_TARGET = target
ifdef IMPORT_LIB_FILES
INSTALL_TARGETS += IMPORT_LIB INSTALL_TARGETS += IMPORT_LIB
endif endif