This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new 152139a Fix build, mistaken early commit
152139a is described below
commit 152139a802b7dd4f3ed206abec794cf50e125aa6
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Jan 11 07:02:05 2023 -0500
Fix build, mistaken early commit
---
Makefile | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index cc1205a..a839b95 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ include Makefile.common
COMMONS_CRYPTO_OUT:=$(TARGET)/$(commons-crypto)-$(os_arch)
COMMONS_CRYPTO_OBJ:=$(addprefix
$(COMMONS_CRYPTO_OUT)/,OpenSslCryptoRandomNative.o OpenSslNative.o
OpenSslInfoNative.o DynamicLoader.o)
-COMMONS_CRYPTO_OSSL3_OBJ:=$(addprefix
$(COMMONS_CRYPTO_OUT)/,OpenSslCryptoRandomNative.o OpenSsl3Native.o
OpenSslInfoNative.o DynamicLoader.o)
# Shorthand for local dependencies
CRYPTO_H:=$(SRC_NATIVE)/org/apache/commons/crypto/org_apache_commons_crypto.h
lib/include/config.h
@@ -39,16 +38,12 @@ endif
NATIVE_TARGET_DIR:=$(TARGET)/classes/org/apache/commons/crypto/native/$(OS_NAME)/$(OS_ARCH)
NATIVE_DLL:=$(NATIVE_TARGET_DIR)/$(LIBNAME)
-NATIVE_OSSL3_DLL:=$(NATIVE_TARGET_DIR)/$(LIBNAME_OSSL3)
-all: $(NATIVE_DLL) $(NATIVE_OSSL3_DLL)
+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)/classes -o $@
org.apache.commons.crypto.cipher.OpenSslNative
-#$(TARGET)/jni-classes/org/apache/commons/crypto/cipher/OpenSsl3Native.h:
$(TARGET)/classes/org/apache/commons/crypto/cipher/OpenSsl3Native.class
-# $(JAVAH) -force -classpath $(TARGET)/classes -o $@
org.apache.commons.crypto.cipher.OpenSsl3Native
-
#$(TARGET)/jni-classes/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.h:
$(TARGET)/classes/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.class
# $(JAVAH) -force -classpath $(TARGET)/classes -o $@
org.apache.commons.crypto.random.OpenSslCryptoRandomNative
@@ -59,10 +54,6 @@ $(COMMONS_CRYPTO_OUT)/OpenSslNative.o :
$(SRC_NATIVE)/org/apache/commons/crypto/
@mkdir -p $(@D)
$(CC) $(CFLAGS) -c $< -o $@
-$(COMMONS_CRYPTO_OUT)/OpenSsl3Native.o :
$(SRC_NATIVE)/org/apache/commons/crypto/cipher/OpenSsl3Native.c $(CRYPTO_H)
$(TARGET)/jni-classes/org_apache_commons_crypto_cipher_OpenSsl3Native.h
- @mkdir -p $(@D)
- $(CC) $(CFLAGS) -c $< -o $@
-
$(COMMONS_CRYPTO_OUT)/OpenSslCryptoRandomNative.o :
$(SRC_NATIVE)/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c
$(CRYPTO_H) $(CRYPTO_RANDOM_H)
$(TARGET)/jni-classes/org_apache_commons_crypto_random_OpenSslCryptoRandomNative.h
@mkdir -p $(@D)
$(CC) $(CFLAGS) -c $< -o $@
@@ -79,24 +70,16 @@ $(COMMONS_CRYPTO_OUT)/$(LIBNAME): $(COMMONS_CRYPTO_OBJ)
$(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
$(STRIP) $@
-$(COMMONS_CRYPTO_OUT)/$(LIBNAME_OSSL3): $(COMMONS_CRYPTO_OSSL3_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
- $(STRIP) $@
-
clean:
$(DELTREE) $(subst /,$(FSEP),$(TARGET)/jni-classes)
$(DELTREE) $(subst /,$(FSEP),$(COMMONS_CRYPTO_OUT))
-native: $(NATIVE_DLL) $(NATIVE_OSSL3_DLL)
+native: $(NATIVE_DLL)
$(NATIVE_DLL): $(COMMONS_CRYPTO_OUT)/$(LIBNAME)
@mkdir -p $(@D)
cp $< $@
-$(NATIVE_OSSL3_DLL): $(COMMONS_CRYPTO_OUT)/$(LIBNAME_OSSL3)
- @mkdir -p $(@D)
- cp $< $@
-
win32:
$(MAKE) native CROSS_PREFIX=i686-w64-mingw32- OS_NAME=Windows
OS_ARCH=x86
