From c50f2f23d8b8f45d0bb7e4c438b8ec41d4e49e6b Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 5 Nov 2017 03:38:19 -0500
Subject: [PATCH] Add more Autotools artifacts to distclean recipe

---
 GNUmakefile       | 9 +++++----
 GNUmakefile-cross | 7 ++++---
 poly1305.cpp      | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index f6ac9a93..89520392 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -781,7 +781,7 @@ clean:
 	@-$(RM) libcryptopp.a libcryptopp.dylib cryptopp.dll libcryptopp.dll.a libcryptopp.import.a
 	@-$(RM) libcryptopp.so libcryptopp.so$(SOLIB_COMPAT_SUFFIX) libcryptopp.so$(SOLIB_VERSION_SUFFIX)
 	@-$(RM) cryptest.exe dlltest.exe cryptest.import.exe cryptest.info ct et
-	@-$(RM) *.gcov *.gcno *.gcda *.stackdump core core-*
+	@-$(RM) *.la *.gcov *.gcno *.gcda *.stackdump core core-*
 	@-$(RM) /tmp/adhoc.exe
 	@-$(RM) -r /tmp/cryptopp_test/
 	@-$(RM) -r *.exe.dSYM/
@@ -794,8 +794,9 @@ distclean: clean
 	@-$(RM) cryptopp.tgz *.o *.bc *.ii *~
 	@-$(RM) -r $(SRCS:.cpp=.obj) cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/
 	@-$(RM) -r $(DOCUMENT_DIRECTORY)/
-	@-$(RM) -f configure.ac configure Makefile.am Makefile *.m4 local.* lt*.sh missing libtool
-	@-$(RM) -f config.guess config.status config.sub depcomp install-sh compile stamp-h1
+	@-$(RM) -f configure.ac configure configure.in Makefile.am Makefile.in Makefile
+	@-$(RM) -f config.guess config.status config.sub depcomp install-sh compile
+	@-$(RM) -f stamp-h1 ar-lib *.m4 local.* lt*.sh missing libtool
 	@-$(RM) -rf m4/ auto*.cache/ .deps/
 	@-$(RM) -r TestCoverage/
 	@-$(RM) cryptopp$(LIB_VER)\.*
@@ -980,7 +981,7 @@ rdrand-%.o:
 	./rdrand-nasm.sh
 endif
 
-# SSE4.2 or NEON available
+# SSSE3 or NEON available
 aria-simd.o : aria-simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(ARIA_FLAG) -c) $<
 
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index 24268142..8d3a57d3 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -328,7 +328,7 @@ clean:
 	@-$(RM) libcryptopp.a libcryptopp.dylib cryptopp.dll libcryptopp.dll.a libcryptopp.import.a
 	@-$(RM) libcryptopp.so libcryptopp.so$(SOLIB_COMPAT_SUFFIX) libcryptopp.so$(SOLIB_VERSION_SUFFIX)
 	@-$(RM) cryptest.exe dlltest.exe cryptest.import.exe cryptest.info ct rdrand-???.o
-	@-$(RM) *.gcno *.gcda *.stackdump core-*
+	@-$(RM) *.la *.gcov *.gcno *.gcda *.stackdump core core-*
 	@-$(RM) /tmp/adhoc.exe
 	@-$(RM) -r /tmp/cryptopp_test/
 	@-$(RM) -r *.exe.dSYM/
@@ -340,8 +340,9 @@ distclean: clean
 	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt cryptest-*.txt
 	@-$(RM) cryptopp.tgz *.o *.bc *.ii *~
 	@-$(RM) -r $(SRCS:.cpp=.obj) cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/
-	@-$(RM) -f configure.ac configure Makefile.am Makefile *.m4 local.* lt*.sh missing libtool
-	@-$(RM) -f config.guess config.status config.sub depcomp install-sh compile stamp-h1
+	@-$(RM) -f configure.ac configure configure.in Makefile.am Makefile.in Makefile
+	@-$(RM) -f config.guess config.status config.sub depcomp install-sh compile
+	@-$(RM) -f stamp-h1 ar-lib *.m4 local.* lt*.sh missing libtool
 	@-$(RM) -rf m4/ auto*.cache/ .deps/
 	@-$(RM) -r TestCoverage/
 	@-$(RM) cryptopp$(LIB_VER)\.*
diff --git a/poly1305.cpp b/poly1305.cpp
index 6f778677..3c23e010 100644
--- a/poly1305.cpp
+++ b/poly1305.cpp
@@ -262,6 +262,6 @@ void Poly1305_Base<T>::Restart()
 	m_idx = 0;
 }
 
-template class Poly1305<AES>;
+CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS Poly1305<AES>;
 
 NAMESPACE_END