Classpath does not need jni-classes Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/c27ed6e1 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/c27ed6e1 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/c27ed6e1
Branch: refs/heads/CRYPTO-1.0.0 Commit: c27ed6e152a260684cba48cb7d7c20ee4c3251cc Parents: 495b053 Author: Sebb <s...@apache.org> Authored: Fri Jul 8 17:55:21 2016 +0100 Committer: Sebb <s...@apache.org> Committed: Fri Jul 8 17:55:21 2016 +0100 ---------------------------------------------------------------------- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/c27ed6e1/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 728f89d..2d35d29 100644 --- a/Makefile +++ b/Makefile @@ -22,13 +22,10 @@ COMMONS_CRYPTO_OBJ:=$(addprefix $(COMMONS_CRYPTO_OUT)/,OpensslCryptoRandom.o Ope # Windows uses different path separators ifeq ($(OS_NAME),Windows) - # Classpath separator - SEP := ; DELTREE := CMD /C DEL /S/Q # The separator used for file paths FSEP := \\ else - SEP := : DELTREE := rm -rf FSEP := / endif @@ -41,10 +38,10 @@ NATIVE_DLL:=$(NATIVE_TARGET_DIR)/$(LIBNAME) all: $(NATIVE_DLL) $(TARGET)/jni-classes/org/apache/commons/crypto/cipher/OpenSslNative.h: $(TARGET)/classes/org/apache/commons/crypto/cipher/OpenSslNative.class - $(JAVAH) -force -classpath $(TARGET)/jni-classes$(SEP)$(TARGET)/classes -o $@ org.apache.commons.crypto.cipher.OpenSslNative + $(JAVAH) -force -classpath $(TARGET)/classes -o $@ org.apache.commons.crypto.cipher.OpenSslNative $(TARGET)/jni-classes/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.h: $(TARGET)/classes/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.class - $(JAVAH) -force -classpath $(TARGET)/jni-classes$(SEP)$(TARGET)/classes -o $@ org.apache.commons.crypto.random.OpenSslCryptoRandomNative + $(JAVAH) -force -classpath $(TARGET)/classes -o $@ org.apache.commons.crypto.random.OpenSslCryptoRandomNative $(COMMONS_CRYPTO_OUT)/OpenSslNative.o : $(SRC_NATIVE)/org/apache/commons/crypto/cipher/OpenSslNative.c $(TARGET)/jni-classes/org/apache/commons/crypto/cipher/OpenSslNative.h @mkdir -p $(@D)
