codeaudit
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 13 additions & 2 deletions b/‎Makefile‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎Manifest.txt‎
Lines changed: 1 addition & 0 deletions b/‎Manifest.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/com/.gitignore‎ ‎com/.gitignore‎src/com/.gitignore renamed to com/.gitignore b/‎src/com/.gitignore‎ ‎com/.gitignore‎src/com/.gitignore renamed to com/.gitignore
diff --git a/‎src/com/arrayfire/Array.java‎ ‎com/arrayfire/Array.java‎src/com/arrayfire/Array.java renamed to com/arrayfire/Array.java b/‎src/com/arrayfire/Array.java‎ ‎com/arrayfire/Array.java‎src/com/arrayfire/Array.java renamed to com/arrayfire/Array.java
diff --git a/‎src/com/arrayfire/Image.java‎ ‎com/arrayfire/Image.java‎src/com/arrayfire/Image.java renamed to com/arrayfire/Image.java b/‎src/com/arrayfire/Image.java‎ ‎com/arrayfire/Image.java‎src/com/arrayfire/Image.java renamed to com/arrayfire/Image.java
diff --git a/‎src/com/arrayfire/Util.java‎ ‎com/arrayfire/Util.java‎src/com/arrayfire/Util.java renamed to com/arrayfire/Util.java b/‎src/com/arrayfire/Util.java‎ ‎com/arrayfire/Util.java‎src/com/arrayfire/Util.java renamed to com/arrayfire/Util.java
@@ -0,0 +1 @@
+*.jar
@@ -18,6 +18,10 @@ AF_CFLAGS      += -I$(JAVA_HOME)/include/linux
 AF_LIB_PATH	= $(AF_PATH)/$(LIB)/
 AF_JAVA_PATH	= $(shell pwd)
 AF_JAVA_LIB	= $(AF_JAVA_PATH)/$(LIB)/libaf_java.so
+AF_JAVA_JAR	= $(AF_JAVA_PATH)/ArrayFire.jar
+AF_JAVA_MANIFEST= $(AF_JAVA_PATH)/Manifest.txt
+AF_JAVA_COM     = $(shell ls com/arrayfire/*.java)
+AF_JAVA_CLASSES = $(patsubst %.java, %.class, $(AF_JAVA_COM))
 
 ifeq ($(findstring opencl, $(MAKECMDGOALS)), opencl)
 	AF_CFLAGS += -DAFCL -I$(OCL_PATH)/include
@@ -33,7 +37,13 @@ cuda: all
 
 opencl: all
 
-all: $(AF_JAVA_LIB)
+all: $(AF_JAVA_JAR)
+
+$(AF_JAVA_JAR): $(AF_JAVA_LIB) $(AF_JAVA_CLASSES)
+	jar cfm $@ $(AF_JAVA_MANIFEST) $(AF_JAVA_CLASSES) $(AF_JAVA_LIB)
+
+%.class: %.java
+	javac $<
 
 $(AF_JAVA_LIB): $(AF_JAVA_LIB_EXT)
 	cp $(AF_JAVA_LIB_EXT) $(AF_JAVA_LIB)
@@ -43,4 +53,5 @@ $(AF_JAVA_LIB_EXT): $(AF_JAVA_PATH)/src/java_wrapper.cpp
 	gcc -shared -fPIC $< $(AF_CFLAGS) -L$(AF_LIB_PATH) -l$(AF) -o $@
 
 clean:
-	rm -f lib/*.so lib64/*.so
+	rm -f lib/*.so lib64/*.so $(AF_JAVA_JAR)
+	rm -f $(AF_JAVA_CLASSES)
@@ -0,0 +1 @@
+Class-Path: ArrayFire.jar