[Rmol-svn-commit] SF.net SVN: rmol:[333] trunk/rmol/test/rmol/Makefile.am

[<den...@us...>]

Revision: 333
          http://rmol.svn.sourceforge.net/rmol/?rev=333&view=rev
Author:   denis_arnaud
Date:     2010-09-06 20:58:49 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
[Build] Changed the dependency on StdAir, which is no longer an external Subversion reference.

Modified Paths:
--------------
    trunk/rmol/test/rmol/Makefile.am

Modified: trunk/rmol/test/rmol/Makefile.am
===================================================================
--- trunk/rmol/test/rmol/Makefile.am	2010-09-06 19:31:12 UTC (rev 332)
+++ trunk/rmol/test/rmol/Makefile.am	2010-09-06 20:58:49 UTC (rev 333)
@@ -18,38 +18,41 @@
 XFAIL_TESTS = #OptimiseTestSuite
 
 OptimiseTestSuite_SOURCES = OptimiseTestSuite.hpp OptimiseTestSuite.cpp
-OptimiseTestSuite_CXXFLAGS= $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS)
+OptimiseTestSuite_CXXFLAGS = $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS) \
+	$(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
 OptimiseTestSuite_LDADD = 
 OptimiseTestSuite_LDFLAGS = $(BOOST_LIBS) $(CPPUNIT_LIBS) \
-	$(top_builddir)/extracppunit/libextracppunit.la \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(EXTRACC_LIBS) $(STDAIR_LIBS) \
 	$(top_builddir)/rmol/core/librmol.la
 
 SimulateTestSuite_SOURCES = SimulateTestSuite.hpp SimulateTestSuite.cpp
-SimulateTestSuite_CXXFLAGS = $(BOOST_CFLAGS) $(GSL_CFLAGS) $(CPPUNIT_CFLAGS)
+SimulateTestSuite_CXXFLAGS = $(BOOST_CFLAGS) $(GSL_CFLAGS) $(CPPUNIT_CFLAGS) \
+	$(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
 SimulateTestSuite_LDADD =
 SimulateTestSuite_LDFLAGS = $(BOOST_LIBS) $(GSL_LIBS) $(CPPUNIT_LIBS) \
-	$(top_builddir)/extracppunit/libextracppunit.la
+	$(EXTRACC_LIBS) $(STDAIR_LIBS)
 
 ForecasterTestSuite_SOURCES = ForecasterTestSuite.hpp ForecasterTestSuite.cpp
-ForecasterTestSuite_CXXFLAGS= $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS)
+ForecasterTestSuite_CXXFLAGS = $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS) \
+	$(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
 ForecasterTestSuite_LDADD = 
 ForecasterTestSuite_LDFLAGS = $(BOOST_LIBS) $(CPPUNIT_LIBS) \
-	$(top_builddir)/extracppunit/libextracppunit.la \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(EXTRACC_LIBS) $(STDAIR_LIBS) \
 	$(top_builddir)/rmol/core/librmol.la
 
 UnconstrainerTestSuite_SOURCES = UnconstrainerTestSuite.hpp \
 							UnconstrainerTestSuite.cpp
-UnconstrainerTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS)
+UnconstrainerTestSuite_CXXFLAGS = $(CPPUNIT_CFLAGS) \
+	$(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
 UnconstrainerTestSuite_LDADD = 
 UnconstrainerTestSuite_LDFLAGS = $(CPPUNIT_LIBS) \
-	$(top_builddir)/extracppunit/libextracppunit.la \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(EXTRACC_LIBS) $(STDAIR_LIBS) \
 	$(top_builddir)/rmol/core/librmol.la
 
 bomsforforecaster_SOURCES = bomsforforecaster.cpp
-bomsforforecaster_CXXFLAGS= $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS)
+bomsforforecaster_CXXFLAGS = $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS) \
+	$(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
 bomsforforecaster_LDADD = 
 bomsforforecaster_LDFLAGS = $(BOOST_LIBS) \
 	$(top_builddir)/rmol/core/librmol.la
+


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