Commit 1f5f55924489c44700fcaef7ebb510da2ba2277c
1 parent
7665fc3d
fix deps with libtool
git-svn-id: svn+q:///qpdf/trunk@623 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
3 changed files
with
31 additions
and
11 deletions
ChangeLog
| 1 | +2008-05-06 Jay Berkenbilt <ejb@ql.org> | ||
| 2 | + | ||
| 3 | + * make/rules.mk: fix logic with .dep generation for .lo files so | ||
| 4 | + that dependencies work properly with libtool | ||
| 5 | + | ||
| 1 | 2008-05-05 Jay Berkenbilt <ejb@ql.org> | 6 | 2008-05-05 Jay Berkenbilt <ejb@ql.org> |
| 2 | 7 | ||
| 3 | - * fix internal MD5 header to be 64-bit clean | 8 | + * libqpdf/qpdf/MD5.hh: fix header to be 64-bit clean |
| 9 | + | ||
| 10 | + * configure.ac: add tests for sized integer types | ||
| 4 | 11 | ||
| 5 | 2008-05-04 Jay Berkenbilt <ejb@ql.org> | 12 | 2008-05-04 Jay Berkenbilt <ejb@ql.org> |
| 6 | 13 | ||
| 7 | - * do not assume size_t is unsigned int | 14 | + * libqpdf/QPDF_encryption.cc: do not assume size_t is unsigned int |
| 8 | 15 | ||
| 9 | - * removed locale-specific tests. These were really to check bugs | ||
| 10 | - in perl 5.8.0 and are obsolete now. They also make the test suite | ||
| 11 | - fail in some environments that don't have all the locales fully | ||
| 12 | - configured. | 16 | + * qpdf/qtest/qpdf.test: removed locale-specific tests. These were |
| 17 | + really to check bugs in perl 5.8.0 and are obsolete now. They | ||
| 18 | + also make the test suite fail in some environments that don't have | ||
| 19 | + all the locales fully configured. | ||
| 13 | 20 | ||
| 14 | - * updated several files for gcc 4.3 (extra includes) | 21 | + * various: updated several files for gcc 4.3 by adding missing |
| 22 | + includes (string.h, stdlib.h) | ||
| 15 | 23 | ||
| 16 | 2008-04-26 Jay Berkenbilt <ejb@ql.org> | 24 | 2008-04-26 Jay Berkenbilt <ejb@ql.org> |
| 17 | 25 |
configure.ac
| 1 | dnl Process this file with autoconf to produce a configure script. | 1 | dnl Process this file with autoconf to produce a configure script. |
| 2 | dnl This config.in requires autoconf 2.5 or greater. | 2 | dnl This config.in requires autoconf 2.5 or greater. |
| 3 | 3 | ||
| 4 | -AC_PREREQ(2.59) | 4 | +AC_PREREQ(2.60) |
| 5 | AC_INIT(qpdf,2.0) | 5 | AC_INIT(qpdf,2.0) |
| 6 | 6 | ||
| 7 | dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer. | 7 | dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer. |
make/rules.mk
| @@ -26,6 +26,17 @@ else | @@ -26,6 +26,17 @@ else | ||
| 26 | depflags= | 26 | depflags= |
| 27 | endif | 27 | endif |
| 28 | 28 | ||
| 29 | +# Usage: $(call libdepflags,$(basename obj)) | ||
| 30 | +# Usage: $(call fixdeps,$(basename obj)) | ||
| 31 | +ifeq ($(GENDEPS),1) | ||
| 32 | +libdepflags=-MD -MF $(1).tdep -MP | ||
| 33 | +fixdeps=sed -e 's/\.o:/.lo:/' < $(1).tdep > $(1).dep | ||
| 34 | + | ||
| 35 | +else | ||
| 36 | +libdepflags= | ||
| 37 | +fixdeps= | ||
| 38 | +endif | ||
| 39 | + | ||
| 29 | # 1 2 | 40 | # 1 2 |
| 30 | # Usage: $(call compile,src,includes) | 41 | # Usage: $(call compile,src,includes) |
| 31 | define compile | 42 | define compile |
| @@ -38,11 +49,12 @@ endef | @@ -38,11 +49,12 @@ endef | ||
| 38 | # 1 2 | 49 | # 1 2 |
| 39 | # Usage: $(call libcompile,src,includes) | 50 | # Usage: $(call libcompile,src,includes) |
| 40 | define libcompile | 51 | define libcompile |
| 41 | - $(LIBTOOL) --mode=compile \ | 52 | + $(LIBTOOL) --quiet --mode=compile \ |
| 42 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ | 53 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) \ |
| 43 | - $(call depflags,$(basename $(call src_to_obj,$(1)))) \ | 54 | + $(call libdepflags,$(basename $(call src_to_obj,$(1)))) \ |
| 44 | $(foreach I,$(2),-I$(I)) \ | 55 | $(foreach I,$(2),-I$(I)) \ |
| 45 | - -c $(1) -o $(call src_to_obj,$(1)) | 56 | + -c $(1) -o $(call src_to_obj,$(1)); \ |
| 57 | + $(call fixdeps,$(basename $(call src_to_obj,$(1)))) | ||
| 46 | endef | 58 | endef |
| 47 | 59 | ||
| 48 | # 1 2 3 4 5 | 60 | # 1 2 3 4 5 |