Index: ../trunk-jpl/src/c/Makefile.am
===================================================================
--- ../trunk-jpl/src/c/Makefile.am	(revision 18318)
+++ ../trunk-jpl/src/c/Makefile.am	(revision 18319)
@@ -854,7 +854,7 @@
 #}}}
 #}}}
 #Library flags and sources {{{
-ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS) 
+ALLCXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) 
 
 libISSMCore_la_SOURCES  = $(issm_sources)
 libISSMCore_la_CXXFLAGS = $(ALLCXXFLAGS) $(DAKOTAFLAGS)
Index: ../trunk-jpl/src/wrappers/python/Makefile.am
===================================================================
--- ../trunk-jpl/src/wrappers/python/Makefile.am	(revision 18318)
+++ ../trunk-jpl/src/wrappers/python/Makefile.am	(revision 18319)
@@ -15,7 +15,7 @@
 				./io/CheckNumPythonArguments.cpp\
 				./io/FetchPythonData.cpp
 
-ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 
+ALLCXXFLAGS= -fPIC -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 
 libISSMPython_la_SOURCES = $(io_sources)
 libISSMPython_la_CXXFLAGS= $(ALLCXXFLAGS)
 #}}}
Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
===================================================================
--- ../trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 18318)
+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 18319)
@@ -15,7 +15,7 @@
 				./io/WriteMatlabData.cpp\
 				./io/FetchMatlabData.cpp
 
-ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 
+ALLCXXFLAGS= -fPIC -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 
 
 libISSMMatlab_la_SOURCES = $(io_sources)
 libISSMMatlab_la_CXXFLAGS= $(ALLCXXFLAGS)
@@ -89,7 +89,7 @@
 AM_LDFLAGS += -Wl,-static
 endif
 
-AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_  -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
+AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -fPIC
 
 deps += ./libISSMMatlab.la ../../c/libISSMModules.la ../../c/libISSMCore.la ./libISSMApi.la
 
