From defa3f78d1a73ab0f2227416e67a44ab6ff311ad Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 1 Nov 2017 18:25:44 -0400 Subject: [PATCH] Add more Autotools artifacts to distclean recipe --- GNUmakefile | 12 +++++++++++- GNUmakefile-cross | 11 ++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4b5c4dd6..64f1ae79 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -650,9 +650,12 @@ endif # HAS_SOLIB_VERSION # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems. SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integer.cpp pch.cpp simple.cpp winpipes.cpp cryptlib_bds.cpp,$(sort $(wildcard *.cpp))) +# For Makefile.am; resource.h is Windows +INCL := $(filter-out resource.h,$(sort $(wildcard *.h))) ifneq ($(IS_MINGW),0) SRCS += winpipes.cpp +INCL += resource.h endif # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems. @@ -670,6 +673,8 @@ endif # Nasm # List test.cpp first to tame C++ static initialization problems. TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp dlltest.cpp fipsalgt.cpp +TESTINCL := bench.h factory.h validate.h +# Test objects TESTOBJS := $(TESTSRCS:.cpp=.o) LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS)) @@ -744,7 +749,11 @@ test check: cryptest.exe sources: adhoc.cpp $(info Library sources: $(filter-out $(TESTSRCS),$(SRCS))) $(info ) + $(info Library headers: $(filter-out $(TESTINCL),$(INCL))) + $(info ) $(info Test sources: $(TESTSRCS)) + $(info ) + $(info Test headers: $(TESTINCL)) # Directory we want (can't specify on Doygen command line) DOCUMENT_DIRECTORY := ref$(LIB_VER) @@ -785,7 +794,8 @@ 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 Makefile.* *.m4 local.* lt*.sh depcomp install-sh configure compile libtool stamp-h1 + @-$(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) -rf m4/ auto*.cache/ .deps/ @-$(RM) -r TestCoverage/ @-$(RM) cryptopp$(LIB_VER)\.* diff --git a/GNUmakefile-cross b/GNUmakefile-cross index f89f6d31..a22602f9 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -273,11 +273,15 @@ endif # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems. SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integer.cpp pch.cpp simple.cpp winpipes.cpp cryptlib_bds.cpp,$(sort $(wildcard *.cpp))) +# For Makefile.am; resource.h is Windows +INCL := $(filter-out resource.h,$(sort $(wildcard *.h))) + # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems. OBJS := $(SRCS:.cpp=.o) # List test.cpp first to tame C++ static initialization problems. TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp +TESTINCL := bench.h factory.h validate.h TESTOBJS := $(TESTSRCS:.cpp=.o) LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS)) @@ -336,7 +340,8 @@ distclean: clean -$(RM) adhoc.cpp adhoc.cpp.copied cryptopp.mapfile 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 Makefile.* *.m4 local.* lt*.sh depcomp install-sh configure compile libtool stamp-h1 + @-$(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) -rf m4/ auto*.cache/ .deps/ @-$(RM) -r TestCoverage/ @-$(RM) cryptopp$(LIB_VER)\.* @@ -408,7 +413,11 @@ cryptest.exe: libcryptopp.a $(TESTOBJS) sources: $(info Library sources: $(filter-out $(TESTSRCS),$(SRCS))) $(info ) + $(info Library headers: $(filter-out $(TESTINCL),$(INCL))) + $(info ) $(info Test sources: $(TESTSRCS)) + $(info ) + $(info Test headers: $(TESTINCL)) adhoc.cpp: adhoc.cpp.proto ifeq ($(wildcard adhoc.cpp),)