From 70d0d0889b0c72bcdeb0658335094f61105f8b02 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 12 Mar 2022 09:25:29 -0500 Subject: Remove old build files --- make/installwin.mk | 21 -------- make/libtool.mk | 141 ----------------------------------------------------- make/mingw.mk | 82 ------------------------------- make/msvc.mk | 97 ------------------------------------ make/proxy.mk | 10 ---- make/rules.mk | 72 --------------------------- 6 files changed, 423 deletions(-) delete mode 100644 make/installwin.mk delete mode 100644 make/libtool.mk delete mode 100644 make/mingw.mk delete mode 100644 make/msvc.mk delete mode 100644 make/proxy.mk delete mode 100644 make/rules.mk (limited to 'make') diff --git a/make/installwin.mk b/make/installwin.mk deleted file mode 100644 index e6ba534f..00000000 --- a/make/installwin.mk +++ /dev/null @@ -1,21 +0,0 @@ -DEST=$(INSTALL_DIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) -IMPORT_LIB_NAME := $(call libname,qpdf) -installwin: all - $(RM) -r $(INSTALL_DIR) - mkdir $(INSTALL_DIR) - mkdir $(DEST) - mkdir $(DEST)/bin - mkdir $(DEST)/lib - mkdir $(DEST)/include - mkdir $(DEST)/include/qpdf - 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 - cp zlib-flate/$(OUTPUT_DIR)/zlib-flate.exe $(DEST)/bin - cp qpdf/$(OUTPUT_DIR)/fix-qdf.exe $(DEST)/bin - cp include/qpdf/*.h $(DEST)/include/qpdf - cp include/qpdf/*.hh $(DEST)/include/qpdf - if [ -d doc ]; then \ - cp -r doc $(DEST); \ - fi diff --git a/make/libtool.mk b/make/libtool.mk deleted file mode 100644 index 6078d650..00000000 --- a/make/libtool.mk +++ /dev/null @@ -1,141 +0,0 @@ -# --- Required interface definitions --- - -# LIBTOOL needs bash -SHELL=/bin/bash - -OBJ=o -LOBJ=lo - -# Usage: $(call libname,base) -define libname -lib$(1).la -endef - -# Usage: $(call binname,base) -define binname -$(1) -endef - -# --- Private definitions --- - -ifeq ($(HAVE_LD_VERSION_SCRIPT), 1) -LD_VERSION_FLAGS=-Wl,--version-script=libqpdf.map -else -LD_VERSION_FLAGS= -endif - -# Usage: $(call libdepflags,$(basename obj)) -# Usage: $(call fixdeps,$(basename obj)) -ifeq ($(GENDEPS),1) -libdepflags=-MD -MF $(1).tdep -MP -fixdeps=sed -e 's/\.o:/.lo:/' < $(1).tdep > $(1).dep - -else -libdepflags= -fixdeps= -endif - -# --- Required rule definitions --- - -# 1 2 3 -# Usage: $(call compile,src,includes,xflags) -define compile - $(CXX) $(CXXFLAGS) $(3) \ - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - $(CPPFLAGS) \ - -c $(1) -o $(call src_to_obj,$(1)) -endef - -# 1 2 3 -# Usage: $(call c_compile,src,includes,xflags) -define c_compile - $(CC) $(CFLAGS) $(3) \ - $(call depflags,$(basename $(call c_src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - $(CPPFLAGS) \ - -c $(1) -o $(call c_src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call libcompile,src,includes) -define libcompile - $(LIBTOOL) --quiet --mode=compile --tag=CXX \ - $(CXX) $(CXXFLAGS) \ - $(call libdepflags,$(basename $(call src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - $(CPPFLAGS) \ - -c $(1) -o $(call src_to_obj,$(1)); \ - $(call fixdeps,$(basename $(call src_to_obj,$(1)))) -endef - -# 1 2 -# Usage: $(call libcompile,src,includes) -define c_libcompile - $(LIBTOOL) --quiet --mode=compile --tag=CC \ - $(CC) $(CFLAGS) \ - $(call libdepflags,$(basename $(call c_src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - $(CPPFLAGS) \ - -c $(1) -o $(call c_src_to_obj,$(1)); \ - $(call fixdeps,$(basename $(call src_to_obj,$(1)))) -endef - -# 1 2 -# Usage: $(call makeslib,objs,library) -define makeslib - $(RM) $2 - $(AR) cru $(2) $(1) - $(RANLIB) $(2) -endef - -# 1 2 3 4 5 6 7 -# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) -define makelib - $(LIBTOOL) --mode=link --tag=CXX \ - $(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \ - -o $(2) $(1) $(3) $(4) \ - $(RPATH) -version-info $(5):$(6):$(7) -no-undefined -endef - -# 1 2 3 4 5 -# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) -define makebin - $(LIBTOOL) --mode=link --tag=CXX \ - $(CXX) $(CXXFLAGS) $(5) $(1) -o $(2) $(3) $(4) -endef - -install-libs: build_libqpdf - ./mkinstalldirs -m 0755 $(DESTDIR)$(libdir)/pkgconfig - ./mkinstalldirs -m 0755 $(DESTDIR)$(includedir)/qpdf - $(LIBTOOL) --mode=install ./install-sh \ - libqpdf/$(OUTPUT_DIR)/libqpdf.la \ - $(DESTDIR)$(libdir)/libqpdf.la - $(LIBTOOL) --finish $(DESTDIR)$(libdir) - ./install-sh -m 0644 include/qpdf/*.h $(DESTDIR)$(includedir)/qpdf - ./install-sh -m 0644 include/qpdf/*.hh $(DESTDIR)$(includedir)/qpdf - ./install-sh -m 0644 libqpdf.pc $(DESTDIR)$(libdir)/pkgconfig - -# Install target - -# NOTE: If installing any new executables, remember to update the -# lambda layer code in build-scripts/build-appimage. - -# Ensure that installwin in make/installwin.mk is consistent with -# this. - -install: all install-libs - ./mkinstalldirs -m 0755 $(DESTDIR)$(bindir) - ./mkinstalldirs -m 0755 $(DESTDIR)$(docdir) - ./mkinstalldirs -m 0755 $(DESTDIR)$(mandir)/man1 - $(LIBTOOL) --mode=install ./install-sh \ - qpdf/$(OUTPUT_DIR)/qpdf \ - $(DESTDIR)$(bindir)/qpdf - $(LIBTOOL) --mode=install ./install-sh \ - zlib-flate/$(OUTPUT_DIR)/zlib-flate \ - $(DESTDIR)$(bindir)/zlib-flate - $(LIBTOOL) --mode=install ./install-sh \ - qpdf/$(OUTPUT_DIR)/fix-qdf \ - $(DESTDIR)$(bindir)/fix-qdf - ./install-sh -m 0644 README-doc.txt $(DESTDIR)$(docdir); \ - ./install-sh -m 0644 manual/$(OUTPUT_DIR)/*.1 $(DESTDIR)$(mandir)/man1 diff --git a/make/mingw.mk b/make/mingw.mk deleted file mode 100644 index 20d648b0..00000000 --- a/make/mingw.mk +++ /dev/null @@ -1,82 +0,0 @@ -# --- Required interface definitions --- - -OBJ=o -LOBJ=o - -# Usage: $(call libname,base) -define libname -lib$(1).dll.a -endef - -# Usage: $(call binname,base) -define binname -$(1).exe -endef - -# --- Required rule definitions --- - -# 1 2 3 -# Usage: $(call compile,src,includes,xflags) -define compile - $(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)) -endef - -# 1 2 3 -# Usage: $(call c_compile,src,includes,xflags) -define c_compile - $(CC) $(CPPFLAGS) $(CFLAGS) $(3) \ - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - -c $(1) -o $(call c_src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call libcompile,src,includes) -define libcompile - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DDLL_EXPORT \ - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - -c $(1) -o $(call src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call c_libcompile,src,includes) -define c_libcompile - $(CC) $(CPPFLAGS) $(CFLAGS) -DDLL_EXPORT \ - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ - $(foreach I,$(2),-I$(I)) \ - -c $(1) -o $(call c_src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call makeslib,objs,library) -define makeslib - $(RM) $2 - $(AR) cru $(2) $(1) - $(RANLIB) $(2) -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\(.*\).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 - -# 1 2 3 4 5 -# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) -define makebin - $(CXX) $(CXXFLAGS) $(5) $(1) -o $(2) $(3) $(4) -endef - -# Install target - -INSTALL_DIR = install-mingw$(WINDOWS_WORDSIZE) -include make/installwin.mk -install: installwin - $(STRIP) $(DEST)/bin/*.exe - $(STRIP) $(DEST)/bin/*.dll diff --git a/make/msvc.mk b/make/msvc.mk deleted file mode 100644 index cfeaa45a..00000000 --- a/make/msvc.mk +++ /dev/null @@ -1,97 +0,0 @@ -# --- Required interface definitions --- - -OBJ=obj -LOBJ=obj - -# Usage: $(call libname,base) -define libname -$(1).lib -endef - -# Usage: $(call binname,base) -define binname -$(1).exe -endef - -# --- Local Changes --- - -# Filter out -g -CFLAGS := $(filter-out -g,$(CFLAGS)) -CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) - -clean:: - $(RM) *.pdb - -# --- Required rule definitions --- - -# 1 2 3 -# Usage: $(call compile,src,includes,xflags) -define compile - 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 - -# 1 2 3 -# Usage: $(call c_compile,src,includes,xflags) -define c_compile - cl -nologo -O2 -Zi -Gy -EHsc -MD $(CPPFLAGS) $(CFLAGS) $(3) \ - $(foreach I,$(2),-I$(I)) \ - -c $(1) -Fo$(call c_src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call libcompile,src,includes) -define libcompile - cl -nologo -O2 -Zi -Gy -EHsc -MD -TP -GR $(CPPFLAGS) $(CXXFLAGS) \ - -DDLL_EXPORT $(foreach I,$(2),-I$(I)) \ - -c $(1) -Fo$(call src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call c_libcompile,src,includes) -define c_libcompile - cl -nologo -O2 -Zi -Gy -EHsc -MD $(CPPFLAGS) $(CXXFLAGS) \ - -DDLL_EXPORT $(foreach I,$(2),-I$(I)) \ - -c $(1) -Fo$(call c_src_to_obj,$(1)) -endef - -# 1 2 -# Usage: $(call makeslib,objs,library) -define makeslib - lib -nologo -OUT:$(2) $(1) -endef - -# 1 2 3 4 5 6 7 -# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) -define makelib - cl -nologo -O2 -Zi -Gy -EHsc -MD -LD -Fe$(basename $(2))$(shell expr $(5) - $(7)).dll $(1) \ - -link -SUBSYSTEM:CONSOLE -incremental:no \ - $(foreach L,$(subst -L,,$(3)),-LIBPATH:$(L)) \ - $(foreach L,$(subst -l,,$(4)),$(L).lib) - if [ -f $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest ]; then \ - mt.exe -nologo -manifest $(basename $(2))$(shell expr $(5) - $(7)).dll.manifest \ - -outputresource:$(basename $(2))$(shell expr $(5) - $(7)).dll\;2; \ - fi - mv $(basename $(2))$(shell expr $(5) - $(7)).lib $(2) -endef - -# 1 2 3 4 5 -# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) -define makebin - cl -nologo -O2 -Zi -Gy -EHsc -MD $(1) \ - $(if $(5),$(5),$(WINDOWS_MAIN_XLINK_FLAGS)) \ - -link -SUBSYSTEM:CONSOLE -incremental:no -OUT:$(2) \ - $(foreach L,$(subst -L,,$(3)),-LIBPATH:$(L)) \ - $(foreach L,$(subst -l,,$(4)),$(L).lib) - if [ -f $(2).manifest ]; then \ - mt.exe -nologo -manifest $(2).manifest \ - -outputresource:$(2)\;2; \ - fi -endef - -# Install target - -INSTALL_DIR = install-msvc$(WINDOWS_WORDSIZE) -include make/installwin.mk -install: installwin diff --git a/make/proxy.mk b/make/proxy.mk deleted file mode 100644 index 16831862..00000000 --- a/make/proxy.mk +++ /dev/null @@ -1,10 +0,0 @@ -THIS=$(notdir $(abspath .)) - -all: - $(MAKE) -C .. build_$(THIS) - -check: - $(MAKE) -C .. check_$(THIS) - -clean: - $(MAKE) -C .. clean_$(THIS) diff --git a/make/rules.mk b/make/rules.mk deleted file mode 100644 index 734f7132..00000000 --- a/make/rules.mk +++ /dev/null @@ -1,72 +0,0 @@ -include make/$(BUILDRULES).mk - -define firstelem -$(word 1,$(subst /, ,$(1))) -endef -SPC := $(subst /, ,/) -define lastelem -$(subst $(SPC),/,$(word $(words $(subst /, ,$(1))),$(subst /, ,$(1)))) -endef -define objbase -$(patsubst %.$(2),%.$(3),$(firstelem)/$(OUTPUT_DIR)/$(lastelem)) -endef - -# Usage: $(call src_to_obj,srcs) -define src_to_obj -$(foreach F,$(1),$(call objbase,$(F),cc,$(OBJ))) -endef - -# Usage: $(call c_src_to_obj,srcs) -define c_src_to_obj -$(foreach F,$(1),$(call objbase,$(F),c,$(OBJ))) -endef - -# Usage: $(call src_to_lobj,srcs) -define src_to_lobj -$(foreach F,$(1),$(call objbase,$(F),cc,$(LOBJ))) -endef - -# Usage: $(call c_src_to_lobj,srcs) -define c_src_to_lobj -$(foreach F,$(1),$(call objbase,$(F),c,$(LOBJ))) -endef - -# Usage: $(call obj_to_dep,objs) -define obj_to_dep -$(patsubst %.$(OBJ),%.dep,$(1)) -endef - -# Usage: $(call lobj_to_dep,objs) -define lobj_to_dep -$(patsubst %.$(LOBJ),%.dep,$(1)) -endef - -# Usage: $(call depflags,$(basename obj)) -ifeq ($(GENDEPS),1) -depflags=-MD -MF $(1).dep -MP -else -depflags= -endif - -ifeq ($(QTEST_COLOR),1) - QTEST_ARGS := -stdout-tty=1 -else - QTEST_ARGS := -endif - -# Usage: $(call run_qtest,dir) -define run_qtest - @echo running qtest-driver for $(1) - @(cd $(1)/$(OUTPUT_DIR); \ - if TC_SRCS="$(foreach T,$(TC_SRCS_$(1)),../../$(T))" \ - $(QTEST) $(QTEST_ARGS) -bindirs .:..:../../qpdf/$(OUTPUT_DIR) \ - -datadir ../qtest -covdir .. \ - -junit-suffix `basename $(1)`; then \ - true; \ - else \ - if test "$(SHOW_FAILED_TEST_OUTPUT)" = "1"; then \ - cat -v qtest.log; \ - fi; \ - false; \ - fi) -endef -- cgit v1.2.3-54-g00ecf