From 4b471e16e9ad407aed3fbb2e6295e7ee204b1008 Mon Sep 17 00:00:00 2001
From: Robert Xiao <brx@cs.ubc.ca>
Date: Fri, 5 May 2023 15:31:10 -0700
Subject: [PATCH] Remove redundant Makefile

---
 bindings/java/Makefile             | 84 ++++++++++++++++++++++++------
 bindings/java/Makefile.build       | 82 -----------------------------
 bindings/java/unicorn/Unicorn.java |  3 +-
 3 files changed, 70 insertions(+), 99 deletions(-)
 delete mode 100644 bindings/java/Makefile.build

diff --git a/bindings/java/Makefile b/bindings/java/Makefile
index 313db888..8ce5fc0e 100644
--- a/bindings/java/Makefile
+++ b/bindings/java/Makefile
@@ -1,29 +1,81 @@
-.PHONY: gen_const clean jar all lib samples install
+all: jar lib samples
 
-all: gen_const
-	$(MAKE) -f Makefile.build all
+JC=javac
 
-lib:
-	$(MAKE) -f Makefile.build lib
+JAVA_HOME := $(shell readlink -f `which $(JC)` | sed "s:/bin/$(JC)::")
 
-samples:
-	$(MAKE) -f  Makefile.build samples
+JAVA_INC := $(shell realpath $(JAVA_HOME)/include)
 
-jar:
-	$(MAKE) -f Makefile.build jar
+JAVA_PLATFORM_INC := $(shell dirname `find $(JAVA_INC) -name jni_md.h`)
+
+UNICORN_INC=../../include
+
+SAMPLES := $(shell ls samples/*.java)
+SRC := $(shell ls unicorn/*.java)
+
+OS := $(shell uname)
+ifeq ($(OS),Darwin)
+   LIB_EXT=.dylib
+else ifeq ($(OS),Linux)
+   LIB_EXT=.so
+else
+   LIB_EXT=.dll
+endif
+
+CC=gcc
+CFLAGS=-fPIC
+LDFLAGS=-shared -fPIC
+LIBS=-lunicorn
+LIBDIR=-L../../
+INCS=-I$(JAVA_INC) -I$(JAVA_PLATFORM_INC) -I$(UNICORN_INC)
+
+CLASSPATH=./
+
+.SUFFIXES: .java .class
+
+%.class: %.java
+	$(JC) -classpath .:unicorn.jar $(JFLAGS) $<
+
+OBJS=unicorn_Unicorn.o
+
+JARFILE=unicorn.jar
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $(INCS) $< -o $@
+
+unicorn_Unicorn.h: unicorn/Unicorn.java
+	javac -h . $<
+
+unicorn_Unicorn.o: unicorn_Unicorn.c unicorn_Unicorn.h
+	$(CC) -c $(CFLAGS) $(INCS) $< -o $@
+
+libunicorn_java$(LIB_EXT): unicorn_Unicorn.o
+
+lib: libunicorn_java$(LIB_EXT) unicorn_Unicorn.h
+	$(CC) -o $< $(LDFLAGS) $(OBJS) $(LIBDIR) $(LIBS)
+
+samples: $(SAMPLES:.java=.class)
+jarfiles: $(SRC:.java=.class)
+
+jar: jarfiles
+	jar cf $(JARFILE) unicorn/*.class
 
 install: lib jar
-	$(MAKE) -f Makefile.build install
+	cp libunicorn_java$(LIB_EXT) /usr/lib
+	cp $(JARFILE) /usr/share/java
 
 uninstall:
-	$(MAKE) -f Makefile.build uninstall
+	rm /usr/lib/libunicorn_java$(LIB_EXT)
+	rm /usr/share/java/$(JARFILE)
 
 gen_const:
 	cd .. && python3 const_generator.py java
 
 clean:
-	rm -f unicorn/*.class
-	rm -f samples/*.class
-	rm -f *.so
-	rm -f *.dylib
-	rm -f *.dll
+	rm unicorn/*.class
+	rm samples/*.class
+	rm *.so
+	rm *.dylib
+	rm *.dll
+
+.PHONY: all lib samples jar install uninstall gen_const clean
diff --git a/bindings/java/Makefile.build b/bindings/java/Makefile.build
deleted file mode 100644
index 0572120a..00000000
--- a/bindings/java/Makefile.build
+++ /dev/null
@@ -1,82 +0,0 @@
-
-.PHONY: gen_const clean
-
-JC=javac
-
-JAVA_HOME := $(shell readlink -f `which $(JC)` | sed "s:/bin/$(JC)::")
-
-JAVA_INC := $(shell realpath $(JAVA_HOME)/include)
-
-JAVA_PLATFORM_INC := $(shell dirname `find $(JAVA_INC) -name jni_md.h`)
-
-UNICORN_INC=../../include
-
-SAMPLES := $(shell ls samples/*.java)
-SRC := $(shell ls unicorn/*.java)
-
-OS := $(shell uname)
-ifeq ($(OS),Darwin)
-   LIB_EXT=.dylib
-else ifeq ($(OS),Linux)
-   LIB_EXT=.so
-else
-   LIB_EXT=.dll
-endif
-
-CC=gcc
-CFLAGS=-fPIC
-LDFLAGS=-shared -fPIC
-LIBS=-lunicorn
-LIBDIR=-L../../
-INCS=-I$(JAVA_INC) -I$(JAVA_PLATFORM_INC) -I$(UNICORN_INC)
-
-CLASSPATH=./
-
-.SUFFIXES: .java .class
-
-%.class: %.java
-	$(JC) -classpath .:unicorn.jar $(JFLAGS) $<
-
-OBJS=unicorn_Unicorn.o
-
-JARFILE=unicorn.jar
-
-all: jar lib samples
-
-%.o: %.c
-	$(CC) -c $(CFLAGS) $(INCS) $< -o $@
-
-unicorn_Unicorn.h: unicorn/Unicorn.java
-	javac -h . $<
-
-unicorn_Unicorn.o: unicorn_Unicorn.c unicorn_Unicorn.h
-	$(CC) -c $(CFLAGS) $(INCS) $< -o $@
-
-libunicorn_java$(LIB_EXT): unicorn_Unicorn.o
-
-lib: libunicorn_java$(LIB_EXT) unicorn_Unicorn.h
-	$(CC) -o $< $(LDFLAGS) $(OBJS) $(LIBDIR) $(LIBS)
-
-samples: $(SAMPLES:.java=.class)
-jarfiles: $(SRC:.java=.class)
-
-jar: jarfiles
-	jar cf $(JARFILE) unicorn/*.class
-
-install: lib jar
-	cp libunicorn_java$(LIB_EXT) /usr/lib
-	cp $(JARFILE) /usr/share/java
-
-uninstall:
-	rm /usr/lib/libunicorn_java$(LIB_EXT)
-	rm /usr/share/java/$(JARFILE)
-
-gen_const:
-	cd .. && python const_generator.py java
-
-clean:
-	rm unicorn/*.class
-	rm samples/*.class
-	rm *.so
-	rm *.dylib
-	rm *.dll
diff --git a/bindings/java/unicorn/Unicorn.java b/bindings/java/unicorn/Unicorn.java
index e1477a48..870f31cf 100644
--- a/bindings/java/unicorn/Unicorn.java
+++ b/bindings/java/unicorn/Unicorn.java
@@ -82,7 +82,8 @@ public class Unicorn
 
     // required to load native method implementations
     static {
-        System.loadLibrary("unicorn_java"); // loads unicorn.dll or libunicorn.so
+        // load libunicorn_java.{so,dylib} or unicorn_java.dll
+        System.loadLibrary("unicorn_java");
         eventMemMap.put(UC_HOOK_MEM_READ_UNMAPPED, UC_MEM_READ_UNMAPPED);
         eventMemMap.put(UC_HOOK_MEM_WRITE_UNMAPPED, UC_MEM_WRITE_UNMAPPED);
         eventMemMap.put(UC_HOOK_MEM_FETCH_UNMAPPED, UC_MEM_FETCH_UNMAPPED);