Index: /issm/trunk-jpl/src/android/ISSM/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/android/ISSM/Makefile.am	(revision 14318)
+++ /issm/trunk-jpl/src/android/ISSM/Makefile.am	(revision 14319)
@@ -1,18 +1,7 @@
 EXTRA_DIST =  AndroidManifest.xml  assets gen jni obj project.properties src Makefile.am bin ic_launcher-web.png libs proguard-project.txt res
 
-#Generate JNI library using the ndk-build capabilities:
-if SHAREDLIBS 	 	 
-deps = 	 	 
-else 	 	 
-deps = $(ISSM_DIR)/src/c/libISSMCore.a ./jni/Main.cpp
-endif
+#Generate JNI library
+lib_LTLIBRARIES = libISSMJNI.la
 
-install-exec-am: all
-all: libs/armeabi/libIssmJni.so
-
-libs/armeabi/libIssmJni.so:  $(deps)
-	$(ANDROID_NDK_DIR)/ndk-build -C ./jni clean
-	$(ANDROID_NDK_DIR)/ndk-build -C ./jni
-
-clean:
-	rm -rf libs obj
+libISSMJNI_la_SOURCES = ./jni/Main.cpp
+libISSMJNI_la_LIBADD = $(ISSM_DIR)/src/c/libISSMCore.a