[Ecell-cvs] SF.net SVN: ecell:[3139] ecell3/trunk/ecell

[<mor...@us...>]

Revision: 3139
          http://ecell.svn.sourceforge.net/ecell/?rev=3139&view=rev
Author:   moriyoshi
Date:     2008-10-02 16:53:01 +0000 (Thu, 02 Oct 2008)

Log Message:
-----------
* Merge from branch

Modified Paths:
--------------
    ecell3/trunk/ecell/libecs/Makefile.am
    ecell3/trunk/ecell/libemc/Makefile.am

Modified: ecell3/trunk/ecell/libecs/Makefile.am
===================================================================
--- ecell3/trunk/ecell/libecs/Makefile.am	2008-10-02 16:51:46 UTC (rev 3138)
+++ ecell3/trunk/ecell/libecs/Makefile.am	2008-10-02 16:53:01 UTC (rev 3139)
@@ -17,7 +17,7 @@
 INCLUDES = -I$(top_srcdir) $(DMTOOL_INCLUDE) $(INCLTDL)
 lib_LTLIBRARIES = libecs.la
 
-AM_CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = $(CXXFLAGS)
 
 libecs_la_LDFLAGS= -version-info 2:0:0 -no-undefined
 libecs_la_LIBADD=  -lstdc++ $(LIBLTDL) $(GSL_LIBADD) scripting/libecs-scripting.la

Modified: ecell3/trunk/ecell/libemc/Makefile.am
===================================================================
--- ecell3/trunk/ecell/libemc/Makefile.am	2008-10-02 16:51:46 UTC (rev 3138)
+++ ecell3/trunk/ecell/libemc/Makefile.am	2008-10-02 16:53:01 UTC (rev 3139)
@@ -15,7 +15,7 @@
 INCLUDES = -I${top_srcdir} ${DMTOOL_INCLUDE} ${INCLTDL}
 lib_LTLIBRARIES = libemc.la
 
-AM_CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = $(CXXFLAGS)
 
 libemc_la_LDFLAGS= -version-info 2:0:0 -no-undefined
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.