[Stdair-svn] SF.net SVN: stdair:[303] trunk/stdair

[<cla...@us...>]

Revision: 303
          http://stdair.svn.sourceforge.net/stdair/?rev=303&view=rev
Author:   clacombe
Date:     2010-09-03 13:53:20 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
[Packaging] Replace extracc external ref to dependency

Modified Paths:
--------------
    trunk/stdair/Makefile.am
    trunk/stdair/configure.ac
    trunk/stdair/test/stdair/Makefile.am

Property Changed:
----------------
    trunk/stdair/


Property changes on: trunk/stdair
___________________________________________________________________
Modified: svn:externals
   - extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit


   + 


Modified: trunk/stdair/Makefile.am
===================================================================
--- trunk/stdair/Makefile.am	2010-09-03 13:15:21 UTC (rev 302)
+++ trunk/stdair/Makefile.am	2010-09-03 13:53:20 UTC (rev 303)
@@ -30,7 +30,7 @@
 EXTRA_DIST =
 
 # Build in these directories:
-SUBDIRS = stdair man $(HTML_DOC_DIR) extracppunit $(TEST_DIR)
+SUBDIRS = stdair man $(HTML_DOC_DIR) $(TEST_DIR)
 
 
 # Configuration helpers

Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac	2010-09-03 13:15:21 UTC (rev 302)
+++ trunk/stdair/configure.ac	2010-09-03 13:53:20 UTC (rev 303)
@@ -104,14 +104,10 @@
 # -----------------------------------------------------------------------------
 # Support for ExtraCC (Extra-CruiseControl): http://sf.net/projects/extracc
 # -----------------------------------------------------------------------------
-# Note: the ExtraCC is now imported as a Subversion external reference,
-#       thus directly accessible within the extracppunit directory.
-#       When that library will be widely avaible on Linux distributions,
-#       the external reference can be removed and the following line uncommented.
-#AM_PATH_EXTRACC
-#AC_SUBST(EXTRACC_VERSION)
-#AC_SUBST(EXTRACC_CFLAGS)
-#AC_SUBST(EXTRACC_LIBS)
+AM_PATH_EXTRACC
+AC_SUBST(EXTRACC_VERSION)
+AC_SUBST(EXTRACC_CFLAGS)
+AC_SUBST(EXTRACC_LIBS)
 
 # --------------------------------------------------------
 # Boost (STL Extensions: http://www.boost.org)
@@ -224,7 +220,6 @@
 	doc/tutorial/src/Makefile
 	doc/local/Makefile
 	doc/doxygen_html.cfg
-	extracppunit/Makefile
 	test/Makefile
 	test/samples/Makefile
 	test/inheritance/Makefile

Modified: trunk/stdair/test/stdair/Makefile.am
===================================================================
--- trunk/stdair/test/stdair/Makefile.am	2010-09-03 13:15:21 UTC (rev 302)
+++ trunk/stdair/test/stdair/Makefile.am	2010-09-03 13:53:20 UTC (rev 303)
@@ -14,10 +14,12 @@
 # Test library
 noinst_LTLIBRARIES = libstdairtest.la
 
-libstdairtest_la_SOURCES = $(stdair_test_lib_h_sources) \
+libstdairtest_la_SOURCES = \
+	$(stdair_test_lib_h_sources) \
 	$(stdair_test_lib_cc_sources)
 libstdairtest_la_CXXFLAGS =
-libstdairtest_la_LDFLAGS = $(top_builddir)/stdair/core/libstdair.la
+libstdairtest_la_LDFLAGS = \
+	$(top_builddir)/stdair/core/libstdair.la
 
 
 ##
@@ -27,11 +29,11 @@
 XFAIL_TESTS = #FailingTestSuite
 
 #
-StandardAirlineITTestSuite_SOURCES = StandardAirlineITTestSuite.hpp \
-									StandardAirlineITTestSuite.cpp
-StandardAirlineITTestSuite_CXXFLAGS= $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS)
+StandardAirlineITTestSuite_SOURCES = \
+	StandardAirlineITTestSuite.hpp \
+	StandardAirlineITTestSuite.cpp
+StandardAirlineITTestSuite_CXXFLAGS= $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS) $(EXTRACC_CFLAGS)
 StandardAirlineITTestSuite_LDADD = 
-StandardAirlineITTestSuite_LDFLAGS = $(BOOST_LIBS) $(CPPUNIT_LIBS) \
-	$(top_builddir)/extracppunit/libextracppunit.la \
+StandardAirlineITTestSuite_LDFLAGS = $(BOOST_LIBS) $(CPPUNIT_LIBS) $(EXTRACC_LIBS)\
 	$(top_builddir)/test/stdair/libstdairtest.la \
 	$(top_builddir)/stdair/core/libstdair.la


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