From 7e9a60da47d2e6f3db5984aa52357a4bcc8aa845 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 4 Nov 2016 21:20:45 -0400 Subject: [PATCH] Add adhoc.cpp to test sources (Issue 332) This should have been included in Commit 8de854cae640473f --- GNUmakefile-cross | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/GNUmakefile-cross b/GNUmakefile-cross index 0d05c6f3..acefbbc5 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -110,14 +110,14 @@ ifeq ($(findstring lean,$(MAKECMDGOALS)),lean) endif # MAKECMDGOALS endif # Dead code stripping -# List cryptlib.cpp first and cpu.cpp second in an attempt to tame C++ static initialization problems. -# The issue spills into POD data types of cpu.cpp due to the storage class of the bools, so cpu.cpp -# is the second candidate for explicit initialization order. +# 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,$(wildcard *.cpp)) + +# List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems. OBJS := $(SRCS:.cpp=.o) -# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?) -TESTSRCS := bench1.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp +# List test.cpp first to tame C++ static initialization problems. +TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp TESTOBJS := $(TESTSRCS:.cpp=.o) LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS)) @@ -245,7 +245,7 @@ cryptest.exe: libcryptopp.a $(TESTOBJS) # Used to generate list of source files for Autotools, CMakeList and Android.mk .PHONY: sources sources: - $(info Library sources: $(filter-out fipstest.cpp $(TESTSRCS),$(SRCS))) + $(info Library sources: $(filter-out $(TESTSRCS),$(SRCS))) $(info ) $(info Test sources: $(TESTSRCS))