Changeset 11665

Timestamp:

03/07/12 14:19:54 (13 years ago)

Author:

Eric.Larour

Message:

Took out Makefile.am in ad. Now resides in the main src/c/Makefile.am,
shielded by the ADIC2 conditional.

Location:

issm/trunk-jpl/src

Files:

• Makefile.am (modified) (1 diff)
• ad/Makefile.am (deleted)
• ad/eraselinks.sh (deleted)
• ad/softlink.sh (deleted)
• c/Makefile.am (modified) (1 diff)

issm/trunk-jpl/src/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST =  perl  pro
 SUBDIRS = c mex m
-
-if ADIC2
-SUBDIRS += ad
-endif
-
-

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

@@ -930 +930 @@
 issm_CXXFLAGS= -fPIC -D_PARALLEL_  $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 #}}}
+#Automatic differentiation: append this fold to the end of the src/c/Makefile.am to get this Makefile.am {{{
+if ADIC2 
+lib_LIBRARIES += libAD.a libpISSMRose.a
+
+#ADIC2 library, for automatic differentiation 
+#libAD_a_SOURCES = ./mini1.ad.c
+libAD_a_SOURCES = 
+libAD_a_CFLAGS = -fPIC -D_PARALLEL_   -D_C_ $(COPTFLAGS)
+
+
+
+#test rose preprocessing 
+%.r2cpp.cpp : %.cpp
+        testTranslator -rose:o $@ -rose:skipfinalCompileStep -DHAVE_CONFIG_H -D_PARALLEL_ -D_C_ -I. -I../.. $(INCLUDES) $<
+libpISSMRose_a_SOURCES = $(libpISSM_a_SOURCES:.cpp=.r2cpp.cpp)
+libpISSMRose_a_CXXFLAGS= -fPIC -D_PARALLEL_ -D_C_ $(CXXOPTFLAGS)
+
+
+
+#Automatic differentiation rules: 
+%.ad.c: %.c
+        adic2 -mforward  $< --nary
+
+
+
+#Executable
+bin_PROGRAMS +=  issmRose.exe
+issmRose_exe_LDADD = ./libpISSMRose.a $(LDADD)
+issmRose_exe_SOURCES = solutions/issm.cpp
+issmRose_exe_CXXFLAGS= -fPIC -D_PARALLEL_  $(CXXOPTFLAGS) $(COPTFLAGS) 
+LDADD +=  $(ADIC2LIB) 
+
+endif #}}}