summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-02-27 13:56:36 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-02-27 13:56:36 +0000
commitcbbcc5f88da802c4aeada36af6d39d322cb4e2ae (patch)
treeb6131b501f8f5516075612fba08858cf1690c638 /dev-libs/crypto++
parentStable on amd64 wrt bug #356583 (diff)
downloadhistorical-cbbcc5f88da802c4aeada36af6d39d322cb4e2ae.tar.gz
historical-cbbcc5f88da802c4aeada36af6d39d322cb4e2ae.tar.bz2
historical-cbbcc5f88da802c4aeada36af6d39d322cb4e2ae.zip
Delete older ebuilds.
Package-Manager: portage-2.2.0_alpha25_p9/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/crypto++')
-rw-r--r--dev-libs/crypto++/ChangeLog7
-rw-r--r--dev-libs/crypto++/Manifest9
-rw-r--r--dev-libs/crypto++/crypto++-5.5.2-r1.ebuild57
-rw-r--r--dev-libs/crypto++/crypto++-5.6.0-r1.ebuild52
-rw-r--r--dev-libs/crypto++/crypto++-5.6.0.ebuild56
-rw-r--r--dev-libs/crypto++/crypto++-5.6.1.ebuild55
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.0-fix_build_system.patch120
7 files changed, 7 insertions, 349 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index 92a289967c29..f3f041b39fbb 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/crypto++
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.71 2011/02/27 11:30:01 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.72 2011/02/27 13:56:36 arfrever Exp $
+
+ 27 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -crypto++-5.5.2-r1.ebuild, -crypto++-5.6.0.ebuild, -crypto++-5.6.0-r1.ebuild,
+ -files/crypto++-5.6.0-fix_build_system.patch, -crypto++-5.6.1.ebuild:
+ Delete.
27 Feb 2011; Tobias Klausmann <klausman@gentoo.org> crypto++-5.6.1-r1.ebuild:
Stable on alpha, bug #343373
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 2b3f507b3668..3ff4730a2d99 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,13 +1,6 @@
-AUX crypto++-5.6.0-fix_build_system.patch 4916 RMD160 1d762f637f9dd5cad1ef0fa7edaad9b81f307a67 SHA1 c8968fe8d2dde15e515e43bdc0c78e9bf9720796 SHA256 facbc38cbd310058ed6d9a1d2cc868d00ec6f41b3840267ce701de14abfabe1c
AUX crypto++-5.6.1-fix_build_system.patch 5008 RMD160 df6813be73acddba7aac0e70abd2c9ff75c5a4de SHA1 c514f778c97cb739f9e3a02f2c44ef86dcafa992 SHA256 cc2c823046f38c154f7cc6899ff2cb94bb378bfbbb534662246d378e751f0480
AUX crypto++-5.6.1-sunos.patch 546 RMD160 69e22a1db8f5fefae1660cf1adbb2cca6600b2d9 SHA1 c21120d904eab8ec3531ebbab68a9663355ac098 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c
-DIST cryptopp552.zip 992073 RMD160 8929795b654d7186b2b38714d22a57ea01862dbd SHA1 18efe451b3c682f40db75dc2b09cb448a835e7d6 SHA256 078f8deb033e2619582b4e9e462bbac5127b0defbcfea49c3583be31f940a759
-DIST cryptopp560.zip 1049029 RMD160 82e5061ec76f23643ba5477ab28bbee6eebd393a SHA1 b836783ebd72d5bc6a916620ab2b1ecec316fef1 SHA256 b522f0b5f850b50e9917823ea986f855295407380fafbe30f358875c41998bc5
DIST cryptopp561.zip 1069703 RMD160 a8a5b80c995c5d4ddafba228caf8866425212fbf SHA1 31dbb456c21f50865218c57b7eaf4c955a222ba1 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
-EBUILD crypto++-5.5.2-r1.ebuild 1604 RMD160 59a14887f8be587735a349ba7ddf9c91a7e2b0d2 SHA1 9e9ff3b1c171f350a7b92ecfeca668ef750b69e4 SHA256 0838d76207c20dd6f4ed26894f633557843cf807ae5ccb2cd72d68189c628793
-EBUILD crypto++-5.6.0-r1.ebuild 1383 RMD160 47dc57c3004fa0b5bb4718b2d2c5d8b8d57e2d6a SHA1 02727959dda01316bdacfd030e49c7d0c1738955 SHA256 9a0fc03ad16dcf768e194c25065bf47627302345ebc2bad0197f8e557dadd758
-EBUILD crypto++-5.6.0.ebuild 1598 RMD160 caae59ceba6198ca359bc7a563912f07ca9cdcce SHA1 25f6ee493565eb3b66aa0890407c186e97318264 SHA256 9c8301fe961079960f095a38611180a722f70309f2e189733d90dad8eb566f56
EBUILD crypto++-5.6.1-r1.ebuild 1380 RMD160 611f381055e27cbbdb9a4593cd50b4118cb25f90 SHA1 fbbc76fcf90df6855b0b1ff2b0dcc3fa5ff56969 SHA256 613af20fe8e05295e207688948f16451f72e26250cb6474257610dfab269995c
-EBUILD crypto++-5.6.1.ebuild 1429 RMD160 8079564fc3a53b533eb68ccc21689ec4f062e1b1 SHA1 7f0a013839686a1dd3808b66900c3f9afe564330 SHA256 96ad8765e622e74a152ed4d0d2bbfc670b71ed76a0c87fe21a3ee3d8599c4895
-MISC ChangeLog 10300 RMD160 6b32cac86d556755ab9d4e8b5dfcd9e358eaad62 SHA1 5e03334677a04d339807aa8992a1a27a415aa7de SHA256 708d55fc9d2e88c607459ccbb9cced5af2cd4be5d85c5351f6c1f00d9b6bb32f
+MISC ChangeLog 10536 RMD160 68a30b5eaad5653e20958c48e24df19a360b1d29 SHA1 b1165b98cb9ef97925291a5bc812f7efe1f85b24 SHA256 b0799ac6498674d1a680980e9377ce0b2ba31f4da2149efcb97a2c1df36dff08
MISC metadata.xml 251 RMD160 127ab6e8b8dd3f2a743bcd6bfea272c751b268ce SHA1 8d42822867803ce048112d88c0dd0ee9c81b6c2c SHA256 1015b452a49cd5d28354cfdaa180045d6b4c0b59dd7697f335a594438110238d
diff --git a/dev-libs/crypto++/crypto++-5.5.2-r1.ebuild b/dev-libs/crypto++/crypto++-5.5.2-r1.ebuild
deleted file mode 100644
index fdc9616848c3..000000000000
--- a/dev-libs/crypto++/crypto++-5.5.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.5.2-r1.ebuild,v 1.2 2008/08/30 02:33:58 dragonheart Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
-HOMEPAGE="http://cryptopp.com"
-SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
-
-LICENSE="cryptopp"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE="sse3"
-
-S="${WORKDIR}"
-
-src_compile() {
- # More than -O1 gives problems
- replace-flags -O? -O1
- filter-flags -fomit-frame-pointer
- use sse3 || append-flags -DCRYPTOPP_DISABLE_SSE2
- emake -f GNUmakefile \
- CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" || die
-}
-
-src_test() {
- # make sure all test vectors have unix line endings
- for f in TestVectors/* ; do
- edos2unix $f
- done
-
- if ! ./cryptest.exe v; then
- eerror "crypto++ self-tests failed"
- eerror "Try to remove some optimization flags and re-emerge"
- die
- fi;
-}
-
-src_install() {
- # For consistency across GNU/Linux distributions,
- # "crypto++" has been preferred over "crytopp"...
- newlib.a libcryptopp.a libcrypto++.a
- # ...unbreak programs which don't expect this
- dosym libcrypto++.a /usr/$(get_libdir)/libcryptopp.a
- insinto /usr/include/crypto++
- doins *.h
- # should the .exe extension be removed??
- dobin cryptest.exe
- # unbreak programs which expect cryptopp
- into /usr/include
- dosym crypto++ /usr/include/cryptopp
-}
diff --git a/dev-libs/crypto++/crypto++-5.6.0-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.0-r1.ebuild
deleted file mode 100644
index 092f2746aa52..000000000000
--- a/dev-libs/crypto++/crypto++-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.0-r1.ebuild,v 1.8 2010/04/25 00:53:57 arfrever Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
-HOMEPAGE="http://cryptopp.com"
-SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
-
-LICENSE="cryptopp"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-fix_build_system.patch"
-}
-
-src_compile() {
- # More than -O1 gives problems.
- replace-flags -O? -O1
- filter-flags -fomit-frame-pointer
- use amd64 && append-flags -DCRYPTOPP_DISABLE_ASM
- emake -f GNUmakefile \
- LIBDIR="$(get_libdir)" \
- CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_test() {
- # Make sure all test vectors have unix line endings.
- 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 || die "emake install failed"
-}
diff --git a/dev-libs/crypto++/crypto++-5.6.0.ebuild b/dev-libs/crypto++/crypto++-5.6.0.ebuild
deleted file mode 100644
index d12bc926ff68..000000000000
--- a/dev-libs/crypto++/crypto++-5.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.0.ebuild,v 1.1 2009/06/27 20:09:40 arfrever Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
-HOMEPAGE="http://cryptopp.com"
-SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
-
-LICENSE="cryptopp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-DEPEND="app-arch/unzip"
-RDEPEND=""
-IUSE="sse3"
-
-S="${WORKDIR}"
-
-src_compile() {
- # More than -O1 gives problems.
- replace-flags -O? -O1
- filter-flags -fomit-frame-pointer
- use sse3 || append-flags -DCRYPTOPP_DISABLE_SSE2
- emake -f GNUmakefile \
- CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" || die "emake failed"
-}
-
-src_test() {
- # Make sure all test vectors have unix line endings.
- for file in TestVectors/*; do
- edos2unix ${file}
- done
-
- if ! ./cryptest.exe v; then
- eerror "crypto++ self-tests failed"
- eerror "Try to remove some optimization flags and re-emerge"
- die
- fi;
-}
-
-src_install() {
- # For consistency across GNU/Linux distributions,
- # "crypto++" has been preferred over "cryptopp"...
- newlib.a libcryptopp.a libcrypto++.a
- # ...unbreak programs which don't expect this
- dosym libcrypto++.a /usr/$(get_libdir)/libcryptopp.a
- insinto /usr/include/crypto++
- doins *.h
- newbin cryptest.exe cryptest
- # Unbreak programs which expect cryptopp
- into /usr/include
- dosym crypto++ /usr/include/cryptopp
-}
diff --git a/dev-libs/crypto++/crypto++-5.6.1.ebuild b/dev-libs/crypto++/crypto++-5.6.1.ebuild
deleted file mode 100644
index 4389b65bb5f5..000000000000
--- a/dev-libs/crypto++/crypto++-5.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1.ebuild,v 1.7 2011/01/08 04:04:54 c1pher Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
-HOMEPAGE="http://cryptopp.com"
-SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
-
-LICENSE="cryptopp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-fix_build_system.patch" \
- "${FILESDIR}/${P}-sunos.patch"
-}
-
-src_compile() {
- # Higher optimizations cause problems.
- replace-flags -O? -O1
- filter-flags -fomit-frame-pointer
- use amd64 && append-flags -DCRYPTOPP_DISABLE_ASM
-
- emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
- LIBDIR="$(get_libdir)" || die "emake failed"
-}
-
-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 \
- || die "emake install failed"
-}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.0-fix_build_system.patch b/dev-libs/crypto++/files/crypto++-5.6.0-fix_build_system.patch
deleted file mode 100644
index abb07e784388..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.0-fix_build_system.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- GNUmakefile
-+++ GNUmakefile
-@@ -1,3 +1,5 @@
-+LIBTOOL = libtool
-+LIBDIR = lib
- CXXFLAGS = -DNDEBUG -g -O2
- #CXXFLAGS = -g
- # -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")
-@@ -98,42 +101,45 @@
- 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
-+DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
-+LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
-+TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
-+DLLTESTOBJS = dlltest.dllonly.lo
-
--all: cryptest.exe
-+all: libcrypto++.la
-
--test: cryptest.exe
-- ./cryptest.exe v
-+test: cryptest
-+ ./cryptest v
-
- clean:
-- $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(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) *.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
-
--libcryptopp.a: $(LIBOBJS)
-- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
-- $(RANLIB) $@
-+libcrypto++.la: $(LIBOBJS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS)
-
--cryptest.exe: libcryptopp.a $(TESTOBJS)
-- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
-+cryptest: libcrypto++.la $(TESTOBJS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcrypto++ $(LDLIBS)
-
- nolib: $(OBJS) # makes it faster to test changes
-- $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CXX) -o ct $(LDFLAGS) $(OBJS) $(LDLIBS)
-
--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
-@@ -142,10 +148,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
-@@ -155,14 +161,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 $<