From 95e1d7db217bd93d811aa7c363d87a91e67bd22e Mon Sep 17 00:00:00 2001
From: J08nY
Date: Wed, 6 Dec 2017 21:15:42 +0100
Subject: Make Makefile more general and make Travis work...

---
 .travis.yml                                       | 11 +++++++----
 src/cz/crcs/ectester/standalone/libs/jni/Makefile | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1bda6a..be275b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,17 @@ addons:
     - libtomcrypt-dev
     - libtommath-dev
     - gcc-6
+    - g++-6
 language: java
 jdk:
-- oraclejdk8
+  - oraclejdk8
+env:
+  - CC=gcc-6 CXX=g++-6
 
 script:
-- ant -f build-applet.xml build
-- ant -f build-reader.xml package
-- ant -f build-standalone.xml package
+  - ant -f build-applet.xml build
+  - ant -f build-reader.xml package
+  - ant -f build-standalone.xml package
 
 deploy:
   provider: releases
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/Makefile b/src/cz/crcs/ectester/standalone/libs/jni/Makefile
index 78433c9..c6df032 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/Makefile
+++ b/src/cz/crcs/ectester/standalone/libs/jni/Makefile
@@ -34,20 +34,23 @@ JNI_PLATFORMINCLUDEDIR ?= $(JNI_INCLUDEDIR)/$(JNI_PLATFORM)
 LOCAL_INCLUDES = /usr/local/include
 LOCAL_LIBS = /usr/local/lib
 
+CC?=gcc
+CXX?=g++
+
 
 all: tomcrypt_provider.so botan_provider.so
 
 tomcrypt_provider.so: tomcrypt.o
-	gcc -fPIC -g -shared -o $@ $< -L. -ltommath -ltomcrypt
+	$(CC) -fPIC -g -shared -o $@ $< -L. -ltommath -ltomcrypt
 
 tomcrypt.o: tomcrypt.c
-	gcc -DLTM_DESC -fPIC -g -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. -c $<
+	$(CC) -DLTM_DESC -fPIC -g -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. -c $<
 
 botan_provider.so: botan.o
-	g++ -fPIC -g -shared -o $@ $< -L. -L"$(LOCAL_LIBS)" -lbotan-2 -fstack-protector -m64 -pthread
+	$(CXX) -fPIC -g -shared -o $@ $< -L. -L"$(LOCAL_LIBS)" -lbotan-2 -fstack-protector -m64 -pthread
 
 botan.o: botan.cpp
-	g++ -fPIC -g -I"$(LOCAL_INCLUDES)/botan-2" -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. -c $<
+	$(CXX) -fPIC -g -I"$(LOCAL_INCLUDES)/botan-2" -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. -c $<
 
 clean:
 	rm -rf *.o
-- 
cgit v1.2.3-70-g09d2