summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-03-02 08:27:21 +0000
committerTim Harder <radhermit@gentoo.org>2013-03-02 08:27:21 +0000
commitef23301a86954c2795c00b98b289d3219ba0c4f0 (patch)
tree2b40775b78415be5e6d35aed4658a998f2dbd387 /dev-libs
parentCleanup due http://gentoo.2317880.n4.nabble.com/rox-herd-looks-inactive-for-a... (diff)
downloadhistorical-ef23301a86954c2795c00b98b289d3219ba0c4f0.tar.gz
historical-ef23301a86954c2795c00b98b289d3219ba0c4f0.tar.bz2
historical-ef23301a86954c2795c00b98b289d3219ba0c4f0.zip
Version bump.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/crypto++/ChangeLog10
-rw-r--r--dev-libs/crypto++/Manifest25
-rw-r--r--dev-libs/crypto++/crypto++-5.6.2.ebuild52
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.2-make.patch150
4 files changed, 221 insertions, 16 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index 03b34946bc08..1942f43dcfa9 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/crypto++
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.76 2012/11/04 19:41:44 c1pher Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.77 2013/03/02 08:27:16 radhermit Exp $
+
+*crypto++-5.6.2 (02 Mar 2013)
+
+ 02 Mar 2013; Tim Harder <radhermit@gentoo.org> +crypto++-5.6.2.ebuild,
+ +files/crypto++-5.6.2-make.patch:
+ Version bump.
04 Nov 2012; Dane Smith <c1pher@gentoo.org> crypto++-5.6.1-r1.ebuild,
crypto++-5.6.1-r3.ebuild:
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 4638f2974750..3798f23db2d1 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -6,25 +6,22 @@ AUX crypto++-5.6.1-gcc-4.7.patch 4442 SHA256 e4b13387ad5f0a2089565709b5fbf95790f
AUX crypto++-5.6.1-r3-fix_build_system.patch 5684 SHA256 b66efd9b50efc66afa06e19601646fd6e4f93f1bc8424192efee3d6e5c8cf514 SHA512 4c60a46c2df6661abcb3bfb83d53a509a7cc0f77c24983f386ea2df1ffd95ee3ecbbc1291ab953553cdab95bec801641e934b5efea8b785869df41bd83067c76 WHIRLPOOL 3f654ca98d5ec603820a1369f718131728cf38f32b19c3e7c7c59248cb37490d58ccd159de5dac0b71985f0bdcfd08a1737535d781f142985b53f57718e5c9a4
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
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
-MISC ChangeLog 11605 SHA256 61e50bb128219863d5d59a8ffe12bdf90caefc41a0e1f2ecf18e20459f9b0093 SHA512 222fb4bc0af2d5e6e7e70a1722f7b203a90d14756ccf74743012d4e11376e18c75902bdd11c9e340b1fa66a61781f9939105483700ca239a77cef80cfd65daa6 WHIRLPOOL a60d3b9c8f264bcf3e8a8d66740fb0e38bd07a6a5523a2114e0cb93c8a3f2b21d4e3cd7af7daaf6e0ef0927c9ab70c2fc94ad1f9dcfc88c1acafec0883921e4d
+EBUILD crypto++-5.6.2.ebuild 1341 SHA256 83b1b2e2f174e474ac45da2471276e8108a3833c2a041bc9c0d952f45b630a97 SHA512 7bddfd81bb25976e25d1be832d6ccf570df20e8f296f12ea766684b637d198b2e404bec6d34acb28b7228d70af0609ab9a56cf3a9dd2674dafea83740b6c63a1 WHIRLPOOL 6545eeda1dec5aaf5aa33ea93fe628c076c65550cf9e4968840a29587f6536c155ba21e375bef372ffd1e1160c448541afcefbd0f8519b8b3faafad06d1df1cc
+MISC ChangeLog 11765 SHA256 4c6878cc06515ef9b4dc239357f90626254c05ede86b39eecca6229b9ac2f70d SHA512 e31ae3cabe746d714bb2d436a154135eb2ee4482477e38d488228934c60366e98b32e40beca79aee39118bd74e261075b2f6c74bc81faf9493091dac8f886b4f WHIRLPOOL 3e03f558b0154be5753ba1f478181ca7f61303068aac4ba9ad91c1843c70db71750a1cdb04341751c3be78724273976fa816a99a27ae45f174de0a20afddf293
MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQlsTgAAoJEEPsD3/icQSzbEoP/R1UjbLKsmmmDMnxtXD7DJfP
-VkzRXUKjG1Gh4XKTGt6W7eH8JvT+jOdrbGGtXmft1hS5Q4aclbVsrjpJZpeitcQk
-y5VMkaxJJlBasUAoTv339LDILkXez6fPNgpsaOAvWy4cpf8lOBsV3xv2TYepMrDp
-XLi33+mpjSImrR2QZ0lX0qSbuhggTVMuBKQdatTYXP7Kxa2h5PhOSHZ2Vt1xDWfS
-6vwGf2ir5ZDfpWsj90q9SebZLM0Mog0+yOm2/18VYmWQg7z9ardz2rDTadUQlLan
-vJJ9vXBWW+5qKwej3S/IeYvT1Enqave1p+SbjCHz35aHHQxnJxRPxViueMBLRZjy
-4V7NwuHvg9RQYRKGa8Vu9VkrD6VXXGH/lbLIkHmuJDa2sDuRUjrtBUOSIN35oc9u
-btk3uC7XAepHcMRbbWpeDLZ+WO1pL1EHpozZzK/jRa0yfQekuSre2m94Cz/xNpD5
-A17nuVoRFTPTTcQPolNmxkJzFH+rx0aIkFm1xmIX8iALZ2cLuDsBmgw1DSOFEyiI
-DcExkUKrVGxkCKU7KWPkG3GEJh+PUQQQuYTEjvIGRonwsKpRg9FYRCR8y56Ll2HE
-xrEMbC27sQ9BOCZ0eudTpdxvmDL9ztQKiS6QdsYtzJhGMwnUdo8Kahxxk2qrJ1DL
-YuIl/wciC5GEEZ+3fioE
-=GUVQ
+iQEcBAEBCAAGBQJRMbfoAAoJEEqz6FtPBkyjYEgIAIu9EJInymxlmqrPrGG3D2WX
+fFrZstQApGXupCgEezhqEoVT/COjkkID2aO1Or+XM1PSdhgcoBbeX8qM5JbvCh8X
+HmCS8I+1sFTh8qVb0uUeghcN+7T9R6koRLoBOxMueQOYiX10JD+knI5VZwmuoc88
+pwbSSXVIDgrFY71/SIQylvfpBFs+XcNy7JxIN4OZd99TdltwF02tA1+xFCZoeOk0
+0Hh7QI0UQMdoc4nL2elfWdKAS4z+71SwyIb5jkuLlIlwgQ696Af2c0USJSK1TGS/
+tZq9ZeL65DwNZZGnoV32hnPRHBpq65nx69FDuDXEEP95NhlVzI+GzAGI9cdTztM=
+=7ni+
-----END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.6.2.ebuild b/dev-libs/crypto++/crypto++-5.6.2.ebuild
new file mode 100644
index 000000000000..fe21b135e19b
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.2.ebuild
@@ -0,0 +1,52 @@
+# 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.ebuild,v 1.1 2013/03/02 08:27:16 radhermit Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="app-arch/unzip
+ sys-devel/libtool"
+
+S=${WORKDIR}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-make.patch
+}
+
+src_compile() {
+ # higher optimizations cause problems
+ replace-flags -O? -O1
+ filter-flags -fomit-frame-pointer
+
+ emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)"
+}
+
+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)" install
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.{a,la}
+}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-make.patch b/dev-libs/crypto++/files/crypto++-5.6.2-make.patch
new file mode 100644
index 000000000000..535ee91f56f0
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.2-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)
++ $(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
++ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
++ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
++ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
+
+ 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.a
++ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so*
++ $(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 $<