diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | make/rules.mk | 18 |
3 files changed, 31 insertions, 11 deletions
@@ -1,17 +1,25 @@ +2008-05-06 Jay Berkenbilt <ejb@ql.org> + + * make/rules.mk: fix logic with .dep generation for .lo files so + that dependencies work properly with libtool + 2008-05-05 Jay Berkenbilt <ejb@ql.org> - * fix internal MD5 header to be 64-bit clean + * libqpdf/qpdf/MD5.hh: fix header to be 64-bit clean + + * configure.ac: add tests for sized integer types 2008-05-04 Jay Berkenbilt <ejb@ql.org> - * do not assume size_t is unsigned int + * libqpdf/QPDF_encryption.cc: do not assume size_t is unsigned int - * removed locale-specific tests. These were really to check bugs - in perl 5.8.0 and are obsolete now. They also make the test suite - fail in some environments that don't have all the locales fully - configured. + * qpdf/qtest/qpdf.test: removed locale-specific tests. These were + really to check bugs in perl 5.8.0 and are obsolete now. They + also make the test suite fail in some environments that don't have + all the locales fully configured. - * updated several files for gcc 4.3 (extra includes) + * various: updated several files for gcc 4.3 by adding missing + includes (string.h, stdlib.h) 2008-04-26 Jay Berkenbilt <ejb@ql.org> diff --git a/configure.ac b/configure.ac index 89603e83..2ce6e5ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl This config.in requires autoconf 2.5 or greater. -AC_PREREQ(2.59) +AC_PREREQ(2.60) AC_INIT(qpdf,2.0) dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer. diff --git a/make/rules.mk b/make/rules.mk index 901534cd..335c6fce 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -26,6 +26,17 @@ else depflags= 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 + # 1 2 # Usage: $(call compile,src,includes) define compile @@ -38,11 +49,12 @@ endef # 1 2 # Usage: $(call libcompile,src,includes) define libcompile - $(LIBTOOL) --mode=compile \ + $(LIBTOOL) --quiet --mode=compile \ $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ + $(call libdepflags,$(basename $(call src_to_obj,$(1)))) \ $(foreach I,$(2),-I$(I)) \ - -c $(1) -o $(call src_to_obj,$(1)) + -c $(1) -o $(call src_to_obj,$(1)); \ + $(call fixdeps,$(basename $(call src_to_obj,$(1)))) endef # 1 2 3 4 5 |