Changeset 14437

Timestamp:

03/07/13 12:33:45 (13 years ago)

Author:

glperez

Message:

CHG: Modified Makefile.am for Android build.

Location:

issm/trunk-jpl/src

Files:

• Makefile.am (modified) (1 diff)
• mobile/Makefile.am (modified) (1 diff)
• mobile/native/Makefile.am (modified) (1 diff)

issm/trunk-jpl/src/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST =  perl
-SUBDIRS = c m wrappers  mobile
+SUBDIRS = c m wrappers mobile

issm/trunk-jpl/src/mobile/Makefile.am

@@ -1 +1 @@
 if ANDROID
-SUBDIRS = android
+SUBDIRS = android native
 endif
 if IOS

issm/trunk-jpl/src/mobile/native/Makefile.am

@@ -3 +3 @@
 
 libISSMJNI_la_SOURCES = Main.cpp
-libISSMJNI_la_LIBADD = $(ISSM_DIR)/src/c/libISSMCore.a $(ISSM_DIR)/externalpackages/gsl/install/lib/libgsl.a
+libISSMJNI_la_LIBADD = $(ISSM_DIR)/src/c/libISSMCore.a $(ISSM_DIR)/externalpackages/gsl/install/lib/libgsl.a $(ISSM_DIR)/externalpackages/gsl/install/lib/libgslcblas.a
+
+AM_LDFLAGS = -llog