Changeset 13652

Timestamp:

10/13/12 10:58:53 (12 years ago)

Author:

Eric.Larour

Message:

CHG: switching modules to wrappers

Location:

issm/trunk-jpl/src

Files:

• Makefile.am (modified) (1 diff)
• c/Makefile.am (modified) (3 diffs)
• wrappers/matlab/Makefile.am (modified) (3 diffs)
• wrappers/python/Makefile.am (modified) (3 diffs)

issm/trunk-jpl/src/Makefile.am

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

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

@@ -18 +18 @@
 lib_LIBRARIES += libISSMMatlab.a 
 endif
-if MODULES
+if WRAPPERS
 if SHAREDLIBS
-lib_LTLIBRARIES += libISSMModules.la
-endif
-lib_LIBRARIES += libISSMModules.a 
+lib_LTLIBRARIES += libISSMWrappers.la
+endif
+lib_LIBRARIES += libISSMWrappers.a 
 endif
 #}}}
@@ -824 +824 @@
 
 #}}}
-#Modules sources{{{
-module_sources= ./shared/Threads/issm_threads.h\
+#Wrappers sources{{{
+wrapper_sources= ./shared/Threads/issm_threads.h\
                         ./shared/Threads/LaunchThread.cpp\
                         ./shared/Threads/PartitionRange.cpp\
@@ -999 +999 @@
 endif
 
-if MODULES
-libISSMModules_a_SOURCES = $(module_sources)
-libISSMModules_a_SOURCES += $(bamg_sources)
+if WRAPPERS
+libISSMWrappers_a_SOURCES = $(wrapper_sources)
+libISSMWrappers_a_SOURCES += $(bamg_sources)
 if KRIGING
-libISSMModules_a_SOURCES += $(kriging_sources)
+libISSMWrappers_a_SOURCES += $(kriging_sources)
 endif
 if KML
-libISSMModules_a_SOURCES += $(kml_sources)
-endif
-libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS)
-libISSMModules_a_LIBADD = ./libISSMCore.a
+libISSMWrappers_a_SOURCES += $(kml_sources)
+endif
+libISSMWrappers_a_CXXFLAGS = $(ALLCXXFLAGS)
+libISSMWrappers_a_LIBADD = ./libISSMCore.a
 if SHAREDLIBS
-libISSMModules_la_SOURCES = $(libISSMModules_a_SOURCES)
+libISSMWrappers_la_SOURCES = $(libISSMWrappers_a_SOURCES)
 endif
 endif

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -3 +3 @@
 EXEEXT=$(MATLABWRAPPEREXT)
 
-#Modules {{{
-if MODULES
+#Wrappers {{{
+if WRAPPERS
 lib_LTLIBRARIES =  AverageFilter.la\
                                                  BamgMesher.la\
@@ -50 +50 @@
 #Flags and libraries {{{
 if SHAREDLIBS
-deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
-else
-deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
+deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+else
+deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
 endif
 
@@ -89 +89 @@
 deps +=
 else
-deps += ../../c/libISSMModules.a ../../c/libISSMCore.a  
+deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a  
 if ADOLC
 deps += $(ADOLCLIB)

issm/trunk-jpl/src/wrappers/python/Makefile.am

@@ -3 +3 @@
 EXEEXT=$(PYTHONWRAPPEREXT)
 
-#Modules {{{
-if MODULES
+#Wrappers {{{
+if WRAPPERS
 lib_LTLIBRARIES = BamgConvertMesh.la\
                                                 BamgMesher.la\
@@ -20 +20 @@
 #Flags and libraries {{{
 if SHAREDLIBS
-deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
+deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
 else
-deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
+deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
 endif
 
@@ -52 +52 @@
 deps +=
 else
-deps += ../../c/libISSMModules.a ../../c/libISSMCore.a
+deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a
 endif