octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

fix deps with libtool

Browse Source 
git-svn-id: svn+q:///qpdf/trunk@623 71b93d88-0707-0410-a8cf-f5a4172ac649
This commit is contained in:
Jay Berkenbilt 2008-05-06 15:23:28 +00:00
parent 7665fc3d81
commit 1f5f559244
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -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> 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> 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 * qpdf/qtest/qpdf.test: removed locale-specific tests. These were
in perl 5.8.0 and are obsolete now. They also make the test suite really to check bugs in perl 5.8.0 and are obsolete now. They
fail in some environments that don't have all the locales fully also make the test suite fail in some environments that don't have
configured. 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> 2008-04-26 Jay Berkenbilt <ejb@ql.org>

2
configure.ac
View File

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl This config.in requires autoconf 2.5 or greater. dnl This config.in requires autoconf 2.5 or greater.
AC_PREREQ(2.59) AC_PREREQ(2.60)
AC_INIT(qpdf,2.0) AC_INIT(qpdf,2.0)
dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer. dnl No AC_CONFIG_HEADERS. If this changes, update README.maintainer.

18
make/rules.mk
View File

@ -26,6 +26,17 @@ else
depflags= depflags=
endif 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 # 1 2
# Usage: $(call compile,src,includes) # Usage: $(call compile,src,includes)
define compile define compile
@ -38,11 +49,12 @@ endef
# 1 2 # 1 2
# Usage: $(call libcompile,src,includes) # Usage: $(call libcompile,src,includes)
define libcompile define libcompile
$(LIBTOOL) --mode=compile \ $(LIBTOOL) --quiet --mode=compile \
$(CXX) $(CPPFLAGS) $(CXXFLAGS) \ $(CXX) $(CPPFLAGS) $(CXXFLAGS) \
$(call depflags,$(basename $(call src_to_obj,$(1)))) \ $(call libdepflags,$(basename $(call src_to_obj,$(1)))) \
$(foreach I,$(2),-I$(I)) \ $(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 endef
# 1 2 3 4 5 # 1 2 3 4 5