Generate a local copy of libtool for building rather than using the system copy.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 244 insertions, 6 deletions

diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index d21d24197855..b9f436231ae9 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/crypto++
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.86 2013/08/14 20:22:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.87 2013/12/07 11:23:26 vapier Exp $
+
+*crypto++-5.6.2-r1 (07 Dec 2013)
+
+  07 Dec 2013; Mike Frysinger <vapier@gentoo.org> +crypto++-5.6.2-r1.ebuild,
+  +files/crypto++-5.6.2-r1-make.patch:
+  Generate a local copy of libtool for building rather than using the system
+  copy.
 
   14 Aug 2013; Fabian Groffen <grobian@gentoo.org> crypto++-5.6.2.ebuild:
   Fixed and marked for ~x64-macos, bug #479554
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index de0e2a6a8f4d..7f1ab392dc5a 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -7,17 +7,29 @@ AUX crypto++-5.6.1-r3-fix_build_system.patch 5684 SHA256 b66efd9b50efc66afa06e19
 AUX crypto++-5.6.1-rijndael.patch 578 SHA256 8d5c406987a1a98c3e2aa5c1046d86bc3ff2c7af6c487b70b8b0fa9cb938ca0c SHA512 02ba1c83a19865c74faa62046b8199138b951b59a79aaae036268fff64ae0d6ba7bc98ab791c17a446d7aaecc526c6b603b1b9d0d513ce349d5a2ff4032d3401 WHIRLPOOL 4aa8bfd92090a7eb75a686bd6ae42bdc5cb5bc620bfb3358cb51ea1a0ad581a9030084512b85808c81361822bd5bcdc265b7d39db0ee8f4d52467da7ffff45e9
 AUX crypto++-5.6.1-sunos.patch 546 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c SHA512 9682e7aaf140c3587dcb0db5ed0bb906e6ccf4f343c17979ffcf4099a5f600a31510e86c1efcf392c8f4cdda0ed6abab5ba87a124b83b26f7ab1b2cbc10e2acd WHIRLPOOL cceec55658ac7436bbb4a8af712044d83336fde54637114d8ff1579af485f0d8e50c8d737028dc02195534b511eda2cca02d8b366877e6ef8dd541b605925154
 AUX crypto++-5.6.2-make.patch 5757 SHA256 1c74320e5111e688e1623b3672d248339c230e240b77a6ff71ef1d07dc005d7a SHA512 c237010ebea7efb9602aa2eaa2d81a3f87a51b60530229458ca3af719b4ee6652a9622672a409a9f5deb6af0adeb4d184c9e5b37bcd89d904cff052d466bb6c6 WHIRLPOOL 55a0b8dd74b3306b1a89df99036388e640824783df7bc67701cabfa7e2abe5946e4553731fcba7503155d8873055a82086c7d69a858a61ff8d9842b043408a6a
+AUX crypto++-5.6.2-r1-make.patch 5600 SHA256 7fd192a4acebf2c8706b322a7682e283a8338819ea10aa3405b6bb8b08406f36 SHA512 cb95468f5b1f61bfffa96519cc98038c9d2f39b3aae42734d92d082d2283b5fdb0841d0873d7d6bb9177120982fbaf70a6973f3f40de31aab070827d708d348d WHIRLPOOL 5b7353f38575aea281c0515e06bf291a05c325336b3f3559007993f5a32df297afccfb39b1fe4a15722c5cf54fc7c337a0cf2de470cf2d08d81e9a946b341783
 DIST cryptopp561.zip 1069703 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268 SHA512 6cc07f36b84a1043e01e458a826d4e3626a2d87b2f606352bc18f607e1c1a68dc3c9b3454659bc1e21e07c9addbf6f4255c5848205fb31c3f445c31a00ebfbf1 WHIRLPOOL 51021ec68fa5b4a988fa343dce1e64455b33c922691a842a2f7801d7359e400bff342f381393aae42114a061cf9ab6365271d7a5c21dd5c26330d41dcb59bfc9
 DIST cryptopp562.zip 1137964 SHA256 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 SHA512 016ca7ebad1091d67ad0bc5ccb7549d96d4af6b563d9d5a612cae27b3d1a3514c41b954e319fed91c820e8c701e3aa43da186e0864bf959ce4afd1539248ebbe WHIRLPOOL e31203da48a31b09e6ea48a75aa64fe5fd27fd370a1a609c4387526f09daab7582716563b688c0c81a8c3b200b8ffa7bdb2b981e5911640e5f1c172d6027f6ac
 EBUILD crypto++-5.6.1-r1.ebuild 1397 SHA256 8474b1601e83723210c33c9811292a79d14eca9991c031fdefda626b5c8e2886 SHA512 3d0fdb9ccebbde09156eb5af3d2860033bccba5f656106c7e59841c2de6843dea10f363ae2291c23931bf3d89882b89dd54dd3c0436b6b419070928d89273a3c WHIRLPOOL c3bbc671c18a9d83302c9860cdcf579f6b1bf2600530511ce293b1c64e3cb9dc1234c1baceec45bce2612e92bd44b7de05f7821ea736474c27fd9997dbd02aed
 EBUILD crypto++-5.6.1-r3.ebuild 1449 SHA256 f6cfe49a51c5d5d61ddcb8cf09307d7ff73c404c8736c54b90d84c83b0ad7a1e SHA512 2091eb3e7b1701c3c36dd841fb51954b8a3595f53c5f010006d6ce62fe56ddca802cbe0719d9687d15a70031a8ba2023926b8e610edaaf148187920f7b9dfd1e WHIRLPOOL f01acd83e54bb051f1581964e2cb49e99d356eff69fc95e577b0dc69bc6c66949d169fe7da5350db1d7d6586f4398a311b5c5cc749f28052fe2884feb5d6ad1f
+EBUILD crypto++-5.6.2-r1.ebuild 1865 SHA256 9106ec08e51e678fc8d8a874ae8ecdb2183252bb9aac42987c66b7d0f0b8bf4e SHA512 fd8ca28c846fe13314964db1a34187050f4aa51847bbab17e0681e91f62015a504de953679635be83f15ff34278b7dce128fb84cdb22f6002b0151e7f28bc3ab WHIRLPOOL 893eb2150173b6af6a00c9c8724ec5466f7d7643377cb899dfc247ffbd46feeea054f8bd14e11da3d34f857972343f440946ffd400f8f57f092eb94924dd0d10
 EBUILD crypto++-5.6.2.ebuild 1783 SHA256 7af05f777e7850428c9c2a019fa6b776a2d8f2a32de2e64eaac20d1ae3d868ed SHA512 6e38e2cd27f6a3c556595ea3d9889c63934b91cbdadcb3287f0a528cd1971c5c4ff2f81608e30f7ff1d2a5b91563a95e3698f529d4e2af9962c34c0d01210ee0 WHIRLPOOL 7e110ae4128609bda9cd669c1af21d1c2d927fdb215e495fb1b9d49c3a99c7d99ce5c32cbcca577e3bbc052c0ea079f8a7fe94cbced115e2a520598e18fd8896
-MISC ChangeLog 12749 SHA256 7577e5a33d20ac8ece92ce580e7393b90ec4f807dc80dea56c7a915b79b7aa67 SHA512 fa9bb3d6312ae739f8662c5c1b8a4f09fd59d0854ce66a02c0d53ad1cd1cfc63d636e39011dda74818d130ee34956a9ff856ece9095f99393ef80f8531155485 WHIRLPOOL b87134df0aab1d0406fea9d331b0b73db90a4547996ddaf818aa326ca752ed83cc95b1d98dcffb1234d59d7e682462bb85bee126fe8b58ac5482f994b50c37aa
+MISC ChangeLog 12984 SHA256 51fce724bacff053d071c2d797fa6e5803ef45e328d30d3836a666c1096a557a SHA512 550d70581c21a1a4b7133be27caa30be031a94be2da4061364efdf06cf410262022270a3597902ca4cded19ef3f051ee5102c9f07fef7d77a55a192542b0beea WHIRLPOOL 58ed0441c3d8d24c0745a8d870d739016d015b9dfe646571e0fecc94a6e0bde23a404337d9585113880990b5bb40478f9e40b2768735d545e5ca46ed6ba3ec83
 MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (Darwin)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIL5wcACgkQX3X2B8XHTokkvgCggaVM/U2Zj9sP5lxKjYe7degU
-piYAn2J06Rw/W4FZHTPZLuFFXMSD38bE
-=Gd++
+iQIcBAEBCAAGBQJSowUwAAoJELEHsLL7fEFWh8AP/3z43m/8Z4y2ixlarkiAB2DV
+HTT6dk2OkfPm3R9JHULzdYEEbD8fmibmGsmXUrhaQW40snXP1zOMD9zpoPJvRTLm
+MP0EgAbrTBy0GJ/5Iy7KTw1aiShfmV8wDPK5syQJc5ekJ6UcZaUcol5uV+DBZhKb
+IlgncYRLEYW7u17plPvkThkLlF2t4PiTv8r0gRdyWuuEr4CREskWdgkXfaN2SW3U
+HaeCoHWUeZiqm9LxoQcnFCX3/YoGUDnIcqJLNtCxCuaA/Qhcyz6u8EpgZ1Fctgx1
+JbKpeaXwRKXAUXQVHRxP01xQDkmzgcP60uvkVnF3qQjv2GSMm1Yl4HqAks4HajJd
+i7CKpl+GQ5+NwsJLLQDcGdd1tjBt7UfJNByN+/81Q01Dyp+22oFuo/nbktUu/7Sx
+KCFjn4K5nxotxu3nkuFUWgNAtPx8aJJKlEFb3xlnLqTMaurlPYmEbKTmwQZCdhDz
+ZYbKZb+6s2pnjbCnXruv4sU2wcHpvCKQOQqC5gzgdbdd1WpjMQKdYg4K/4A1wA11
+a7VEgjL3EPvOBJx6j4is0dequRU0NhlgPXPj51mBFvvJTAMdzf5J/gVIJsQwPzqu
+8tke9zwh1i9/SS9/C7s4vp5d+rRh7AdxgK0ybjgAAJ9yz6LxO+qpvK2RJFlla8eV
+5SUn0K6zKX+4CoQA75x6
+=Bc4O
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.6.2-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.2-r1.ebuild
new file mode 100644
index 000000000000..8ebd0be6e795
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.2-r1.ebuild,v 1.1 2013/12/07 11:23:26 vapier Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs autotools
+
+DESCRIPTION="C++ class library of cryptographic schemes"
+HOMEPAGE="http://cryptopp.com"
+SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="static-libs"
+
+DEPEND="app-arch/unzip
+	sys-devel/libtool"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-r1-make.patch
+
+	# Generate our own libtool script for building.
+	cat <<-EOF > configure.ac
+	AC_INIT(lt, 0)
+	AM_INIT_AUTOMAKE
+	LT_INIT
+	AC_CONFIG_FILES(Makefile)
+	AC_OUTPUT
+	EOF
+	touch NEWS README AUTHORS ChangeLog Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	# higher optimizations cause problems
+	replace-flags -O? -O1
+	filter-flags -fomit-frame-pointer
+	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+	[[ ${CHOST} == *-darwin* ]] && append-flags -DCRYPTOPP_DISABLE_X86ASM
+
+	emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" LIBTOOL="./libtool"
+}
+
+src_test() {
+	# ensure that all test vectors have Unix line endings
+	local file
+	for file in TestVectors/* ; do
+		edos2unix ${file}
+	done
+
+	if ! emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" test ; then
+		eerror "Crypto++ self-tests failed."
+		eerror "Try to remove some optimization flags and reemerge Crypto++."
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch b/dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch
new file mode 100644
index 000000000000..854d8d79dba5
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.2-r1-make.patch
@@ -0,0 +1,150 @@
+--- cryptopp562/GNUmakefile
++++ cryptopp562/GNUmakefile
+@@ -1,3 +1,5 @@
++LIBTOOL = libtool
++LIBDIR = lib
+ CXXFLAGS = -DNDEBUG -g -O2
+ # -O3 fails to link on Cygwin GCC version 4.5.3
+ # -fPIC is supported. Please report any breakage of -fPIC as a bug.
+@@ -7,8 +9,9 @@
+ # LDFLAGS += -Wl,--gc-sections
+ ARFLAGS = -cr	# ar needs the dash on OpenBSD
+ RANLIB = ranlib
+-CP = cp
++LN_S = ln -s
+ MKDIR = mkdir
++INSTALL = install
+ EGREP = egrep
+ UNAME = $(shell uname)
+ ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
+@@ -79,8 +82,11 @@
+ LDLIBS += -lws2_32
+ endif
+ 
++THREAD_LIBS =
++
+ ifeq ($(IS_LINUX),1)
+ LDFLAGS += -pthread
++THREAD_LIBS += -lpthread
+ ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0)
+ M32OR64 = -m64
+ endif
+@@ -126,54 +132,52 @@
+ SRCS = $(shell echo *.cpp)
+ endif
+ 
+-OBJS = $(SRCS:.cpp=.o)
+-# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?)
+-TESTOBJS = bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o fipsalgt.o dlltest.o
++OBJS = $(SRCS:.cpp=.lo)
++# test.lo needs to be after bench.lo for cygwin 1.1.4 (possible ld bug?)
++TESTOBJS = bench.lo bench2.lo test.lo validat1.lo validat2.lo validat3.lo adhoc.lo datatest.lo regtest.lo fipsalgt.lo dlltest.lo
+ LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS))
+ 
+ DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp
+-DLLOBJS = $(DLLSRCS:.cpp=.export.o)
+-LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
+-TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
+-DLLTESTOBJS = dlltest.dllonly.o
+-
+-all: cryptest.exe
+-static: libcryptopp.a
+-dynamic: libcryptopp.so
++DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
++LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
++TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
++DLLTESTOBJS = dlltest.dllonly.lo
++
++all: libcrypto++.la
+ 
+-test: cryptest.exe
+-	./cryptest.exe v
++test: cryptest
++	./cryptest v
+ 
+ clean:
+-	-$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS)
++	$(RM) -f .libs cryptest libcrypto++.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
++
+ 
+ install:
+-	$(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
+-	-$(CP) *.h $(PREFIX)/include/cryptopp
+-	-$(CP) *.a $(PREFIX)/lib
+-	-$(CP) *.so $(PREFIX)/lib
+-	-$(CP) *.exe $(PREFIX)/bin
++	$(MKDIR) -p $(DESTDIR)$(PREFIX)/include/crypto++ $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	$(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/crypto++
++	$(LN_S) crypto++ $(DESTDIR)$(PREFIX)/include/cryptopp
++	$(LIBTOOL) --mode=install $(INSTALL) libcrypto++.la $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	set -e; \
++	for f in $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcrypto++*; do \
++		$(LN_S) $${f##*/} `echo $$f | sed "s:libcrypto++:libcryptopp:"`; \
++	done
+ 
+ remove:
+-	-$(RM) -rf $(PREFIX)/include/cryptopp
+-	-$(RM) $(PREFIX)/lib/libcryptopp.a
+-	-$(RM) $(PREFIX)/lib/libcryptopp.so
+-	-$(RM) $(PREFIX)/bin/cryptest.exe
+-
+-libcryptopp.a: $(LIBOBJS)
+-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+-	$(RANLIB) $@
++	$(RM) -rf $(DESTDIR)$(PREFIX)/include/crypto++
++	$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.*
++	$(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcrypto++.*
++	$(RM) $(DESTDIR)$(PREFIX)/bin/cryptest
+ 
+-libcryptopp.so: $(LIBOBJS)
+-	$(CXX) -shared -o $@ $(LIBOBJS)
++libcrypto++.la: $(LIBOBJS)
++	$(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS) $(THREAD_LIBS)
+ 
+-cryptest.exe: libcryptopp.a $(TESTOBJS)
+-	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
++cryptest: libcrypto++.la $(TESTOBJS)
++	$(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcrypto++ $(LDLIBS) $(THREAD_LIBS)
+ 
+ nolib: $(OBJS)		# makes it faster to test changes
+-	$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
++	$(LIBTOOL) --tag=CXX --mode=link $(CXX) -o ct $(LDFLAGS) $(OBJS) $(LDLIBS) $(THREAD_LIBS)
+ 
+-dll: cryptest.import.exe dlltest.exe
++dll: cryptest.import dlltest
+ 
+ cryptopp.dll: $(DLLOBJS)
+ 	$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
+@@ -182,10 +186,10 @@
+ 	$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
+ 	$(RANLIB) $@
+ 
+-cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
++cryptest.import: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
+ 	$(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS)
+ 
+-dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
++dlltest: cryptopp.dll $(DLLTESTOBJS)
+ 	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
+ 
+ adhoc.cpp: adhoc.cpp.proto
+@@ -195,14 +199,14 @@
+ 	touch adhoc.cpp
+ endif
+ 
+-%.dllonly.o : %.cpp
++%.dllonly.lo : %.cpp
+ 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@
+ 
+-%.import.o : %.cpp
++%.import.lo : %.cpp
+ 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@
+ 
+-%.export.o : %.cpp
++%.export.lo : %.cpp
+ 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@
+ 
+-%.o : %.cpp
+-	$(CXX) $(CXXFLAGS) -c $<
++%.lo : %.cpp
++	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(CXXFLAGS) -c $<