merged README

README.md

@@ -9,8 +9,8 @@ See [Remote Development Setup](RemoteDev-Setup.md) tutorial.
 Building the project involves two steps
 
 1. Connect to the remote device
-2. Build native code on command line
-    * Command line:```cd jni && make```
+2. Build Java + native code on command line
+```cd jni && make```
 
 # Run project
 
@@ -20,7 +20,3 @@ This can be done via the VM argument ```-Djava.library.path```.
 ## Command line
 
 ```java -Djava.library.path=jni -cp bin java_exercises8_1_1.HelloJNI```
\ No newline at end of file
-
-
-
-

jni/makefile

 # Define common variables
 CLASS_PATH = ../bin
 JAVA_SRC_PATH = ../src
-JAVA_HOME=/usr/lib/jvm/jdk-8-oracle-arm32-vfp-hflt/
+JAVA_HOME=/usr/lib/jvm/jdk-8-oracle-arm-vfp-hflt
 
 #Paths to libmcp23s17 and libpifacecad
 LIB_MCP23S17=../../libmcp23s17
@@ -16,7 +16,7 @@ all : libhello.so
 run :
 	java -cp $(CLASS_PATH) -Djava.library.path=../jni java_exercises8_1_1.HelloJNI
 
-java_exercises8_1_1/HelloJNI.class:
+java_exercises8_1_1/HelloJNI.class: $(JAVA_SRC_PATH)/java_exercises8_1_1/HelloJNI.java
 	javac -cp $(CLASS_PATH) -d $(CLASS_PATH) $(JAVA_SRC_PATH)/java_exercises8_1_1/HelloJNI.java
 
 # Targets for java_exercises8_1_1
@@ -33,4 +33,4 @@ HelloJNI.h : java_exercises8_1_1/HelloJNI.class
 	javah -o HelloJNI.h -classpath $(CLASS_PATH) java_exercises8_1_1.$*
 
 clean :
-	rm HelloJNI.h HelloJNI.o libhello.so
+	rm -rf HelloJNI.h HelloJNI.o libhello.so $(CLASS_PATH)/*
\ No newline at end of file