diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/gcc-linux.mk | 6 | ||||
| -rw-r--r-- | make/installwin.mk | 11 | ||||
| -rw-r--r-- | make/libtool.mk | 6 | ||||
| -rw-r--r-- | make/mingw.mk | 13 | ||||
| -rw-r--r-- | make/msvc.mk | 7 | ||||
| -rw-r--r-- | make/rules.mk | 3 |
6 files changed, 25 insertions, 21 deletions
diff --git a/make/gcc-linux.mk b/make/gcc-linux.mk index d34ecf04..490b314c 100644 --- a/make/gcc-linux.mk +++ b/make/gcc-linux.mk @@ -22,10 +22,10 @@ endef # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(3)\ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -o $(call src_to_obj,$(1)) diff --git a/make/installwin.mk b/make/installwin.mk index f4bc411e..ff162175 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 @@ -17,5 +18,9 @@ installwin: all cp include/qpdf/*.h $(DEST)/include/qpdf cp include/qpdf/*.hh $(DEST)/include/qpdf cp doc/stylesheet.css $(DEST)/doc - cp doc/qpdf-manual.html $(DEST)/doc - cp doc/qpdf-manual.pdf $(DEST)/doc + if [ -f doc/qpdf-manual.html ]; then \ + cp doc/qpdf-manual.html $(DEST)/doc; \ + fi + if [ -f doc/qpdf-manual.pdf ]; then \ + cp doc/qpdf-manual.pdf $(DEST)/doc; \ + fi diff --git a/make/libtool.mk b/make/libtool.mk index e68bea4c..34b0fe2c 100644 --- a/make/libtool.mk +++ b/make/libtool.mk @@ -37,10 +37,10 @@ endif # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CXXFLAGS) \ + $(CXX) $(CXXFLAGS) $(3) \ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ $(CPPFLAGS) \ diff --git a/make/mingw.mk b/make/mingw.mk index 00119d1a..235149ff 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) @@ -15,10 +15,10 @@ endef # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(3) \ $(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -o $(call src_to_obj,$(1)) @@ -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..1dafbcf0 100644 --- a/make/msvc.mk +++ b/make/msvc.mk @@ -24,10 +24,10 @@ clean:: # --- Required rule definitions --- -# 1 2 -# Usage: $(call compile,src,includes) +# 1 2 3 +# Usage: $(call compile,src,includes,xflags) define compile - cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) \ + cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) $(3) \ $(foreach I,$(2),-I$(I)) \ -c $(1) -Fo$(call src_to_obj,$(1)) endef @@ -92,6 +92,5 @@ endef # Install target INSTALL_DIR = install-msvc$(WINDOWS_WORDSIZE) -STATIC_LIB_NAME = qpdf.lib include make/installwin.mk install: installwin diff --git a/make/rules.mk b/make/rules.mk index 09401cd3..1963807f 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -53,7 +53,8 @@ define run_qtest @echo running qtest-driver for $(1) @(cd $(1)/$(OUTPUT_DIR); \ if TC_SRCS="$(foreach T,$(TC_SRCS_$(1)),../../$(T))" \ - $(QTEST) -bindirs .:.. -datadir ../qtest -covdir ..; then \ + $(QTEST) -bindirs .:.. -datadir ../qtest -covdir .. \ + -junit-suffix `basename $(1)`; then \ true; \ else \ if test "$(SHOW_FAILED_TEST_OUTPUT)" = "1"; then \ |