Changeset 14921

Timestamp:

05/06/13 09:32:32 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved issm.cpp in src/c/main (same for kriging)

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (4 diffs)
• main (added)
• main/issm.cpp (moved) (moved from issm/trunk-jpl/src/c/issm.cpp )
• main/issm.h (moved) (moved from issm/trunk-jpl/src/c/issm.h ) (1 diff)
• main/kriging.cpp (moved) (moved from issm/trunk-jpl/src/c/kriging.cpp )

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

@@ -19 +19 @@
 #sources
 #Core sources{{{
-core_sources = ./issm.h\
-                                        ./issm-binding.h\
+core_sources = ./main/issm.h\
                                         ./classes/classes.h\
                                         ./classes/objects.h\
@@ -959 +958 @@
 
 if SHAREDLIBS
-libISSM_la_SOURCES = issm.cpp
+libISSM_la_SOURCES = main/issm.cpp
 libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
 
@@ -1017 +1016 @@
 endif
 
-issm_SOURCES = issm.cpp
+issm_SOURCES = main/issm.cpp
 issm_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 
 if KRIGING
 bin_PROGRAMS += kriging
-kriging_SOURCES = kriging.cpp
+kriging_SOURCES = main/kriging.cpp
 kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 endif
@@ -1053 +1052 @@
 bin_PROGRAMS +=  issmRose.exe
 issmRose_exe_LDADD = ./libISSMRose.a $(LDADD)
-issmRose_exe_SOURCES = issm.cpp
+issmRose_exe_SOURCES = main/issm.cpp
 issmRose_exe_CXXFLAGS= -fPIC $(CXXOPTFLAGS) $(COPTFLAGS) 
 LDADD +=  $(ADIC2LIB) 

issm/trunk-jpl/src/c/main/issm.h

@@ -12 +12 @@
 #endif
 
-#include "./include/globals.h" //only include this header file once!
-#include "./shared/shared.h"
-#include "./classes/classes.h"
-#include "./Container/Container.h"
-#include "./EnumDefinitions/EnumDefinitions.h"
-#include "./toolkits/toolkits.h"
-#include "./solutions/solutions.h"
-#include "./solvers/solvers.h"
-#include "./modules/modules.h"
+#include "../include/globals.h" //only include this header file once!
+#include "../shared/shared.h"
+#include "../classes/classes.h"
+#include "../Container/Container.h"
+#include "../EnumDefinitions/EnumDefinitions.h"
+#include "../toolkits/toolkits.h"
+#include "../solutions/solutions.h"
+#include "../solvers/solvers.h"
+#include "../modules/modules.h"
 
 #endif //ifndef _ISSM_H_