source: issm/oecreview/Archive/14312-15392/ISSM-14318-14319.diff

Last change on this file was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 932 bytes
RevLine 
[15393]1Index: ../trunk-jpl/src/android/ISSM/Makefile.am
2===================================================================
3--- ../trunk-jpl/src/android/ISSM/Makefile.am (revision 14318)
4+++ ../trunk-jpl/src/android/ISSM/Makefile.am (revision 14319)
5@@ -1,18 +1,7 @@
6 EXTRA_DIST = AndroidManifest.xml assets gen jni obj project.properties src Makefile.am bin ic_launcher-web.png libs proguard-project.txt res
7
8-#Generate JNI library using the ndk-build capabilities:
9-if SHAREDLIBS
10-deps =
11-else
12-deps = $(ISSM_DIR)/src/c/libISSMCore.a ./jni/Main.cpp
13-endif
14+#Generate JNI library
15+lib_LTLIBRARIES = libISSMJNI.la
16
17-install-exec-am: all
18-all: libs/armeabi/libIssmJni.so
19-
20-libs/armeabi/libIssmJni.so: $(deps)
21- $(ANDROID_NDK_DIR)/ndk-build -C ./jni clean
22- $(ANDROID_NDK_DIR)/ndk-build -C ./jni
23-
24-clean:
25- rm -rf libs obj
26+libISSMJNI_la_SOURCES = ./jni/Main.cpp
27+libISSMJNI_la_LIBADD = $(ISSM_DIR)/src/c/libISSMCore.a
Note: See TracBrowser for help on using the repository browser.