Changeset 14919

Timestamp:

05/05/13 21:53:19 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved issm and kriging up a level to src/c/

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (3 diffs)
• issm.cpp (moved) (moved from issm/trunk-jpl/src/c/solutions/issm.cpp ) (1 diff)
• kriging.cpp (moved) (moved from issm/trunk-jpl/src/c/solutions/kriging.cpp ) (1 diff)

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

@@ -959 +959 @@
 
 if SHAREDLIBS
-libISSM_la_SOURCES = solutions/issm.cpp
+libISSM_la_SOURCES = issm.cpp
 libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
 
@@ -1017 +1017 @@
 endif
 
-issm_SOURCES = solutions/issm.cpp
+issm_SOURCES = issm.cpp
 issm_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 
 if KRIGING
 bin_PROGRAMS += kriging
-kriging_SOURCES = solutions/kriging.cpp
+kriging_SOURCES = kriging.cpp
 kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 endif
@@ -1053 +1053 @@
 bin_PROGRAMS +=  issmRose.exe
 issmRose_exe_LDADD = ./libISSMRose.a $(LDADD)
-issmRose_exe_SOURCES = solutions/issm.cpp
+issmRose_exe_SOURCES = issm.cpp
 issmRose_exe_CXXFLAGS= -fPIC $(CXXOPTFLAGS) $(COPTFLAGS) 
 LDADD +=  $(ADIC2LIB) 

issm/trunk-jpl/src/c/issm.cpp

@@ -3 +3 @@
  */ 
 
-#include "../issm.h"
+#include "./issm.h"
 
 int main(int argc,char **argv){

issm/trunk-jpl/src/c/kriging.cpp

@@ -3 +3 @@
  */ 
 
-#include "../issm.h"
+#include "./issm.h"
 
 /*Local prototypes*/