Changeset 11442

Timestamp:

02/14/12 11:52:45 (13 years ago)

Author:

Eric.Larour

Message:

Missing CXXFLAGS and CFLAGS from Makefile.am

File:

• issm/trunk-jpl/src/c/Makefile.am (modified) (3 diffs)

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

@@ -894 +894 @@
 libISSM_a_SOURCES += $(matlab_sources)
 
-libISSM_a_CXXFLAGS = -fPIC -DMATLAB -D_SERIAL_ -ansi -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXOPTFLAGS)
+libISSM_a_CXXFLAGS = -fPIC -DMATLAB -D_SERIAL_ -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS) 
 if LARGEARRAYS
 libISSM_a_CXXFLAGS += -D__GCC4BUILD__  
@@ -904 +904 @@
 libpISSM_a_SOURCES  = $(issm_sources)
 libpISSM_a_SOURCES += $(issm_psources)
-libpISSM_a_CXXFLAGS = -fPIC -D_PARALLEL_   -D_C_ $(CXXOPTFLAGS) 
+libpISSM_a_CXXFLAGS = -fPIC -D_PARALLEL_   -D_C_ $(CXXFLAGS) $(CXXOPTFLAGS) 
 #}}}
 #Overload library, to overload any non-standard symbols. {{{1
 libOverload_a_SOURCES = ./shared/String/stricmp.c
-libOverload_a_CFLAGS  = -fPIC -D_PARALLEL_   -D_C_ $(COPTFLAGS)
+libOverload_a_CFLAGS  = -fPIC -D_PARALLEL_   -D_C_ $(COPTFLAGS) $(CFLAGS)
 #}}}
 
@@ -925 +925 @@
 
 issm_exe_SOURCES = solutions/issm.cpp
-issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_  $(CXXOPTFLAGS) $(COPTFLAGS) 
-#}}}
+issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_  $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+#}}}