Fixed makefile to use IS_IOS rather than IS_DARWIN for iOS cross-compiles. Updated Android to use AOSP_* variables rather than ANDROID_* variables

GNUmakefile-cross

@@ -4,7 +4,7 @@ CXXFLAGS ?= -DNDEBUG -g2 -Os -fPIC -pipe
 # CXXFLAGS += -ffunction-sections -fdata-sections
 # LDFLAGS += -Wl,--gc-sections
 
-ARFLAGS = -cr	# ar needs the dash on OpenBSD
+ARFLAGS = cr
 RANLIB ?= ranlib
 CP = cp
 MKDIR = mkdir
@@ -13,11 +13,9 @@ CHMOD = chmod
 
 CLANG_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "clang")
 
-IS_X86=0
+IS_IOS ?= 0
-IS_LINUX=0
+IS_ANDROID ?= 0
-IS_MINGW=0
+IS_ARM_EMBEDDED ?= 0
-IS_DARWIN=0
-UNAME=CrossCompile
 
 # Default prefix for make install
 ifeq ($(PREFIX),)
@@ -28,62 +26,69 @@ endif
 # Its a shame because GCC has so much to offer by the way of analysis.
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
 ifneq ($(CLANG_COMPILER),0)
-CXXFLAGS += -Wall
+CXXFLAGS += -Wall -Wno-delete-non-virtual-dtor
 endif
 
-# iOS cross-compile configuration. Works in conjunction with IS_CROSS_COMPILE.
+# iOS cross-compile configuration.
 #   See http://www.cryptopp.com/wiki/iOS_(Command_Line).
 ifeq ($(IS_IOS),1)
   CXX = clang++
 
-  CXXFLAGS += -DCRYPTOPP_DISABLE_ASM  $(IOS_FLAGS)
+  CXXFLAGS += $(IOS_FLAGS) -arch $(IOS_ARCH)
-  CXXFLAGS += -arch $(IOS_ARCH) -isysroot $(IOS_SYSROOT)
+  CXXFLAGS += -isysroot $(IOS_SYSROOT) -stdlib=libc++
-  CXXFLAGS += -stdlib=libc++
 
   AR = libtool
   ARFLAGS = -static -o
+  RANLIB = ranlib
 endif
 
-# Android cross-compile configuration. Works in conjunction with IS_CROSS_COMPILE.
+# Android cross-compile configuration.
 #   See http://www.cryptopp.com/wiki/Android_(Command_Line).
 ifeq ($(IS_ANDROID),1)
   # CPP, CXX, AR, RANLIB, LD, etc are set in 'setenv-android.sh'
-  CXXFLAGS += -DCRYPTOPP_DISABLE_ASM $(ANDROID_FLAGS)
+  CXXFLAGS += $(AOSP_FLAGS) -DANDROID --sysroot=$(AOSP_SYSROOT)
-  CXXFLAGS += --sysroot=$(ANDROID_SYSROOT) -I$(ANDROID_STL_INC)
+  CXXFLAGS += -Wa,--noexecstack -I$(AOSP_STL_INC)
-  LDLIBS += $(ANDROID_STL_LIB)
+
+  # c++config.h shows up in odd places at times.
+  ifneq ($(AOSP_BITS_INC),)
+    CXXFLAGS += -I$(AOSP_BITS_INC)
+  endif
+
+  LDLIBS += $(AOSP_STL_LIB)
 endif
 
-# ARM embedded cross-compile configuration. Works in conjunction with IS_CROSS_COMPILE.
+# ARM embedded cross-compile configuration.
 #   See http://www.cryptopp.com/wiki/ARM_Embedded_(Command_Line)
 #   and http://www.cryptopp.com/wiki/ARM_Embedded_(Bare Metal).
 ifeq ($(IS_ARM_EMBEDDED),1)
   # CPP, CXX, AR, RANLIB, LD, etc are set in 'setenv-embedded.sh'
-  CXXFLAGS += -DCRYPTOPP_DISABLE_ASM $(ARM_EMBEDDED_FLAGS)
+  CXXFLAGS += $(ARM_EMBEDDED_FLAGS) --sysroot=$(ARM_EMBEDDED_SYSROOT)
-  CXXFLAGS += --sysroot=$(ARM_EMBEDDED_SYSROOT)
 endif
 
-# List cryptlib.cpp first in an attempt to tame C++ static initialization problems
+# 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.
 SRCS := cryptlib.cpp cpu.cpp $(filter-out cryptlib.cpp cpu.cpp pch.cpp simple.cpp winpipes.cpp cryptlib_bds.cpp,$(wildcard *.cpp))
-
-# List of objects with crytlib.o at the first index position
 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
+TESTSRCS := bench.cpp bench2.cpp test.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
+TESTOBJS := $(TESTSRCS:.cpp=.o)
 LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
 
-# List cryptlib.cpp first in an attempt to tame C++ static initialization problems
+# For Shared Objects, Diff, Dist/Zip rules
-DLLSRCS := cryptlib.cpp cpu.cpp algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.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
+LIB_VER := $(shell $(EGREP) "define CRYPTOPP_VERSION" config.h | cut -d" " -f 3)
-DLLOBJS := $(DLLSRCS:.cpp=.export.o)
+LIB_MAJOR := $(shell echo $(LIB_VER) | cut -c 1)
+LIB_MINOR := $(shell echo $(LIB_VER) | cut -c 2)
+LIB_PATCH := $(shell echo $(LIB_VER) | cut -c 3)
 
-# Import lib testing
+ifeq ($(strip $(LIB_PATCH)),)
-LIBIMPORTOBJS := $(LIBOBJS:.o=.import.o)
+LIB_PATCH := 0
-TESTIMPORTOBJS := $(TESTOBJS:.o=.import.o)
+endif
-DLLTESTOBJS := dlltest.dllonly.o
 
 all: cryptest.exe
 
-ifneq ($(IS_DARWIN),0)
+ifneq ($(IS_IOS),0)
 static: libcryptopp.a
 shared dynamic dylib: libcryptopp.dylib
 else
@@ -96,15 +101,15 @@ test: cryptest.exe
 
 .PHONY: clean
 clean:
-	-$(RM) cryptest.exe dlltest.exe libcryptopp.a libcryptopp.so libcryptopp.dylib cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe ct
+	-$(RM) cryptest.exe libcryptopp.a libcryptopp.so libcryptopp.dylib
-	-$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+	-$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS)
 ifneq ($(wildcard *.dSYM),)
-	-$(RM) -r cryptest.exe.dSYM dlltest.exe.dSYM
+	-$(RM) -r cryptest.exe.dSYM
 endif
 
 .PHONY: distclean
 distclean: clean
-	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps cryptopp$(LIB_VER).diff cryptopp$(LIB_VER).zip *.o *.ii *.s
+	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps *.o *.ii *.s
 
 .PHONY: install
 install:
@@ -116,7 +121,7 @@ install:
 	-$(CHMOD) 644 $(PREFIX)/lib/libcryptopp.a
 	-$(CP) cryptest.exe $(PREFIX)/bin
 	-$(CHMOD) 755 $(PREFIX)/bin/cryptest.exe
-ifneq ($(IS_DARWIN),0)
+ifneq ($(IS_IOS),0)
 	-$(CP) libcryptopp.dylib $(PREFIX)/lib
 	-$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.dylib
 else
@@ -129,22 +134,32 @@ remove uninstall:
 	-$(RM) -r $(PREFIX)/include/cryptopp
 	-$(RM) $(PREFIX)/lib/libcryptopp.a
 	-$(RM) $(PREFIX)/bin/cryptest.exe
-ifneq ($(IS_DARWIN),0)
+ifneq ($(IS_IOS),0)
 	-$(RM) $(PREFIX)/lib/libcryptopp.dylib
 else
 	-$(RM) $(PREFIX)/lib/libcryptopp.so
 endif
 
-libcryptopp.a: public_service | $(LIBOBJS)
+libcryptopp.a: $(LIBOBJS)
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@
 
-libcryptopp.so: public_service | $(LIBOBJS)
+libcryptopp.so: $(LIBOBJS)
-	$(CXX) $(CXXFLAGS) -shared -o $@ $(LIBOBJS) $(LDFLAGS) $(LDLIBS)
+	$(CXX) -shared -o $@ $(CXXFLAGS) -Wl,--exclude-libs,ALL $(LIBOBJS) $(LDLIBS)
 
-cryptest.exe: public_service | libcryptopp.a $(TESTOBJS)
+libcryptopp.dylib: $(LIBOBJS)
+	$(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" $(LIBOBJS)
+
+cryptest.exe: libcryptopp.a $(TESTOBJS)
 	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
 
+# 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 )
+	$(info Test sources: $(TESTSRCS))
+
 adhoc.cpp: adhoc.cpp.proto
 ifeq ($(wildcard adhoc.cpp),)
 	cp adhoc.cpp.proto adhoc.cpp
@@ -162,25 +177,3 @@ endif # Dependencies
 
 GNUmakefile.deps:
 	$(CXX) $(CXXFLAGS) -MM *.cpp > GNUmakefile.deps
-
-# Warn of potential configurations issues. This will go away after 5.6.3
-UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
-NO_INIT_PRIORITY := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_INIT_PRIORITY" config.h)
-COMPATIBILITY_562 := $(shell $(EGREP) -c "^[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562" config.h)
-.PHONY: public_service
-public_service:
-ifneq ($(UNALIGNED_ACCESS),0)
-	$(info WARNING: CRYPTOPP_NO_UNALIGNED_DATA_ACCESS is not defined in config.h.)
-endif
-ifneq ($(NO_INIT_PRIORITY),0)
-	$(info WARNING: CRYPTOPP_INIT_PRIORITY is not defined in config.h.)
-endif
-ifneq ($(COMPATIBILITY_562),0)
-	$(info WARNING: CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 is defined in config.h.)
-endif
-ifneq (x$(UNALIGNED_ACCESS)$(NO_INIT_PRIORITY)$(COMPATIBILITY_562),x000)
-	$(info WARNING: You should make these changes in config.h, and not CXXFLAGS.)
-	$(info WARNING: You can 'mv config.recommend config.h', but it breaks versioning.)
-	$(info WARNING: See http://cryptopp.com/wiki/config.h for more details.)
-	$(info )
-endif