Changeset 13653

Timestamp:

10/13/12 14:15:44 (12 years ago)

Author:

Eric.Larour

Message:

CHG: stop installign wrappers if config says so

Location:

issm/trunk-jpl/src

Files:

• Makefile.am (modified) (1 diff)
• android/helloworld/My First App/.classpath (modified) (1 diff)
• android/helloworld/OpenGLES20/.classpath (modified) (1 diff)
• android/helloworld/OpenGLES20/bin/classes.dex (modified) ( previous)
• android/helloworld/OpenGLES20/bin/resources.ap_ (modified) ( previous)
• m/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/src/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST =  perl pro py
-SUBDIRS = c m
-if WRAPPERS
-SUBDIRS += wrappers 
-endif
+SUBDIRS = c m wrappers 

issm/trunk-jpl/src/android/helloworld/My First App/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="gen"/>
-        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
         <classpathentry kind="output" path="bin/classes"/>
 </classpath>

issm/trunk-jpl/src/android/helloworld/OpenGLES20/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+        <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="gen"/>
-        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-        <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
         <classpathentry kind="output" path="bin/classes"/>
 </classpath>

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

@@ -3 +3 @@
 #find . -type d -exec ls -d {} \;
 
+if WRAPPERS
 bin_SCRIPTS= ./qmu/*.m \
                                  ./qmu/setupdesign/*.m \
@@ -49 +50 @@
                                  ./solvers/*.m \
                                  ./materials/*.m
+endif