diff options
| author | J08nY | 2018-05-28 02:13:41 +0200 |
|---|---|---|
| committer | J08nY | 2018-05-28 02:13:41 +0200 |
| commit | a14900f5b106fb6cfbccb928b2d6306cd9aacf68 (patch) | |
| tree | 4c22f72c1b77e96f6b905098ede906828c579d42 | |
| parent | 47e0465f1260e249016b512363b8625418a35ac3 (diff) | |
| download | ECTester-a14900f5b106fb6cfbccb928b2d6306cd9aacf68.tar.gz ECTester-a14900f5b106fb6cfbccb928b2d6306cd9aacf68.tar.zst ECTester-a14900f5b106fb6cfbccb928b2d6306cd9aacf68.zip | |
| -rw-r--r-- | src/cz/crcs/ectester/standalone/libs/jni/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/Makefile b/src/cz/crcs/ectester/standalone/libs/jni/Makefile index 3530499..732ab20 100644 --- a/src/cz/crcs/ectester/standalone/libs/jni/Makefile +++ b/src/cz/crcs/ectester/standalone/libs/jni/Makefile @@ -13,8 +13,7 @@ JNI_INCLUDEDIR ?= $(JAVA_HOME)/include endif ifeq ($(JNI_INCLUDEDIR),) -$(error could not determine JNI include dir, try specifying either \ - JAVA_HOME or JNI_INCLUDEDIR) +$(error could not determine JNI include dir, try specifying either JAVA_HOME or JNI_INCLUDEDIR) endif TARGETTRIPLET := $(shell $(CC) -dumpmachine) @@ -51,17 +50,17 @@ cpp_utils.o: cpp_utils.cpp tomcrypt_provider.so: tomcrypt.o c_utils.o - $(CC) -fPIC -g -shared -o $@ $^ -L. -ltommath -ltomcrypt + $(CC) -fPIC -g -shared -o $@ $^ -L. -ltommath $(shell pkg-config --libs libtomcrypt) tomcrypt.o: tomcrypt.c - $(CC) -DLTM_DESC $(CFLAGS) -c $< + $(CC) -DLTM_DESC $(shell pkg-config --cflags libtomcrypt) $(CFLAGS) -c $< botan_provider.so: botan.o cpp_utils.o - $(CXX) -fPIC -g -shared -o $@ $^ -L. -L"$(LOCAL_LIBS)" -lbotan-2 -fstack-protector -m64 -pthread + $(CXX) -fPIC -g -shared -o $@ $^ -L. $(shell pkg-config --libs botan-2) botan.o: botan.cpp - $(CXX) -I"$(LOCAL_INCLUDES)/botan-2" $(CFLAGS) -c $< + $(CXX) $(shell pkg-config --cflags botan-2) $(CFLAGS) -c $< clean: rm -rf *.o |