diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2018-08-14 22:28:52 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2018-08-14 22:57:37 +0200 |
| commit | e37ce851902af9a0c54508a693024ceaccf49abd (patch) | |
| tree | b3a510b568e8bdd7370c519a786069ab1d4a6f90 /make | |
| parent | 8ca46d1ff0177b1f7f1804cb25c85bd3ff0316e5 (diff) | |
| download | qpdf-e37ce851902af9a0c54508a693024ceaccf49abd.tar.zst | |
Clarify static vs. import library on Windows (fixes #225)
Diffstat (limited to 'make')
| -rw-r--r-- | make/installwin.mk | 3 | ||||
| -rw-r--r-- | make/mingw.mk | 7 | ||||
| -rw-r--r-- | make/msvc.mk | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/make/installwin.mk b/make/installwin.mk index f4bc411e..960cc51f 100644 --- a/make/installwin.mk +++ b/make/installwin.mk @@ -1,4 +1,5 @@ DEST=$(INSTALL_DIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) +IMPORT_LIB_NAME := $(call libname,qpdf) installwin: all $(RM) -r $(INSTALL_DIR) mkdir $(INSTALL_DIR) @@ -8,7 +9,7 @@ installwin: all mkdir $(DEST)/include mkdir $(DEST)/include/qpdf mkdir $(DEST)/doc - cp libqpdf/$(OUTPUT_DIR)/$(STATIC_LIB_NAME) $(DEST)/lib + cp libqpdf/$(OUTPUT_DIR)/$(IMPORT_LIB_NAME) $(DEST)/lib cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin perl copy_dlls libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(DEST)/bin $(OBJDUMP) $(WINDOWS_WORDSIZE) cp qpdf/$(OUTPUT_DIR)/qpdf.exe $(DEST)/bin diff --git a/make/mingw.mk b/make/mingw.mk index 00119d1a..fbfbee9e 100644 --- a/make/mingw.mk +++ b/make/mingw.mk @@ -5,7 +5,7 @@ LOBJ=o # Usage: $(call libname,base) define libname -lib$(1).a +lib$(1).dll.a endef # Usage: $(call binname,base) @@ -62,8 +62,8 @@ endef # 1 2 3 4 5 6 7 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) define makelib - $(DLLTOOL) -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \ - $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll \ + $(DLLTOOL) -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).dll.a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \ + $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).dll.a,/\1,'`$(shell expr $(5) - $(7)).dll \ $(1) $(3) $(4) endef @@ -76,7 +76,6 @@ endef # Install target INSTALL_DIR = install-mingw$(WINDOWS_WORDSIZE) -STATIC_LIB_NAME = libqpdf.a include make/installwin.mk install: installwin $(STRIP) $(DEST)/bin/*.exe diff --git a/make/msvc.mk b/make/msvc.mk index 3e061091..4af234c3 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -92,6 +92,5 @@ endef # Install target INSTALL_DIR = install-msvc$(WINDOWS_WORDSIZE) -STATIC_LIB_NAME = qpdf.lib include make/installwin.mk install: installwin |