Code cleanup.

[mhash384/mhash384.git] / Makefile

diff --git a/Makefile b/Makefile
index 06d8d98..5d230b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,14 +26,14 @@ ifeq ($(OS),Windows_NT)
   BINEXT := .exe
   DLLEXT := .dll
   PYDEXT := .pyd
-  DLLOPT :=
+  DLLOPT := -shared
 else
   OSTYPE := linux
   JNIDIR := linux
-  BINEXT :=
+  BINEXT := .run
   DLLEXT := .so
   PYDEXT := .so
-  DLLOPT += -fPIC
+  DLLOPT := -fPIC -shared
 endif
 
 ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -44,7 +44,7 @@ CM_FLAGS := -I$(ROOT_DIR)/include
 RL_FLAGS := -DNDEBUG -O3 -march=$(CPU_TYPE)
 DB_FLAGS := -g
 EX_FLAGS := -static
-SO_FLAGS := -shared $(DLLOPT) -static-libgcc -static-libstdc++
+SO_FLAGS := $(DLLOPT) -static-libgcc -static-libstdc++
 PD_FLAGS := --from markdown --to html5 --toc -N --standalone
 
 
@@ -81,15 +81,13 @@ else
 endif
 
 CLI_BIN := $(ROOT_DIR)bin/mhash_384.$(ARCH)$(BINEXT)
-CLI_DBG := $(BIN).dbg
+CLI_DBG := $(ROOT_DIR)bin/mhash_384_g.$(ARCH)$(BINEXT)
 CLI_OUT := $(ROOT_DIR)out/mhash_384.$(ISO_DATE).bin-$(OSTYPE)-$(ARCH).tar.gz
 
 JNI_SRC := $(wildcard $(ROOT_DIR)bindings/Java/native/src/*.cpp)
-JNI_INC := $(ROOT_DIR)bindings/Java/native/include
-JNI_BIN := $(ROOT_DIR)bindings/Java/native/bin/MHashJava384.$(ARCH)$(DLLEXT)
-JNI_JAR := $(ROOT_DIR)bindings/Java/wrapper/out/MHashJava384-Wrapper.jar
+JNI_JAR := $(ROOT_DIR)bindings/Java/library/out/MHashJava384.jar
 JNI_GUI := $(ROOT_DIR)bindings/Java/example/out/MHashJava384-Example.jar
-JNI_OUT := $(ROOT_DIR)out/mhash_384.$(ISO_DATE).java-$(OSTYPE)-$(ARCH).tar.gz
+JNI_OUT := $(ROOT_DIR)out/mhash_384.$(ISO_DATE).bin-java.tar.gz
 
 PYC_SRC := $(wildcard $(ROOT_DIR)bindings/Python/native/src/*.cpp)
 PYC_PTH := $(ROOT_DIR)bindings/Python/wrapper/mhash.pth