[Simfqt-svn] SF.net SVN: simfqt:[14] trunk/simfqt

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 14
          http://simfqt.svn.sourceforge.net/simfqt/?rev=14&view=rev
Author:   denis_arnaud
Date:     2010-09-07 09:57:32 +0000 (Tue, 07 Sep 2010)

Log Message:
-----------
[Build] The StdAir and ExtraCC projects are no longer Subversion external references.

Modified Paths:
--------------
    trunk/simfqt/Makefile.am
    trunk/simfqt/configure.ac
    trunk/simfqt/simfqt/Makefile.am
    trunk/simfqt/simfqt/basic/Makefile.am
    trunk/simfqt/simfqt/basic/sources.mk
    trunk/simfqt/simfqt/batches/Makefile.am
    trunk/simfqt/simfqt/bom/Makefile.am
    trunk/simfqt/simfqt/bom/sources.mk
    trunk/simfqt/simfqt/command/Makefile.am
    trunk/simfqt/simfqt/command/sources.mk
    trunk/simfqt/simfqt/core/Makefile.am
    trunk/simfqt/simfqt/core/sources.mk
    trunk/simfqt/simfqt/factory/Makefile.am
    trunk/simfqt/simfqt/factory/sources.mk
    trunk/simfqt/simfqt/service/Makefile.am
    trunk/simfqt/simfqt/service/sources.mk
    trunk/simfqt/test/Makefile.am
    trunk/simfqt/test/simfqt/Makefile.am

Property Changed:
----------------
    trunk/simfqt/
    trunk/simfqt/test/


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


   + config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config



Modified: trunk/simfqt/Makefile.am
===================================================================

--- trunk/simfqt/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -21,10 +21,16 @@
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
 			config-h.in sic/stamp-h.in autogen.sh bootstrap
 
-EXTRA_DIST = @PACKAGE@.spec @PACKAGE@.m4 @PACKAGE@.pc Makefile.common 
+# Note 1: the RPM specification file (@PACKAGE@.spec) must not be distributed
+# with the rest of the source code. The tar-ball will be used by the packaging
+# process, from an external RPM specification file: duplicating it in the
+# tar-ball may only confuse things.
+# Note 2: Both @PACKAGE@.m4 and @PACKAGE@.pc must not be distributed, as they
+# will be generated by the configure script.
+EXTRA_DIST =
 
 # Build in these directories:
-SUBDIRS = stdair @PACKAGE@ extracppunit $(TEST_DIR)
+SUBDIRS = simfqt $(TEST_DIR)
 
 
 # Configuration helpers

Modified: trunk/simfqt/configure.ac
===================================================================
--- trunk/simfqt/configure.ac	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/configure.ac	2010-09-07 09:57:32 UTC (rev 14)
@@ -10,10 +10,6 @@
 AM_PATH_CPPUNIT(1.10)
 AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
 
-# RPM release number
-RPM_RELEASE="1"
-AC_SUBST(RPM_RELEASE)
-
 # Shared library versioning
 GENERIC_LIBRARY_VERSION="99:99:99"
 #                        | | |
@@ -105,14 +101,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)
 
 # -----------------------------------------------------------
 # Python: http://www.python.org
@@ -172,7 +164,15 @@
 AC_SUBST(SOCI_CFLAGS)
 AC_SUBST(SOCI_LIBS)
 
+# -----------------------------------------------------------------------------
+# Support for StdAir (): http://sf.net/projects/stdair
+# -----------------------------------------------------------------------------
+AM_PATH_STDAIR
+AC_SUBST(STDAIR_VERSION)
+AC_SUBST(STDAIR_CFLAGS)
+AC_SUBST(STDAIR_LIBS)
 
+
 # -------------------------------------------------------------------
 # Support for documentation
 # -------------------------------------------------------------------
@@ -244,18 +244,7 @@
 	Makefile
 	simfqt-config
 	simfqt.pc
-	simfqt.spec
 	simfqt.m4
-	stdair/Makefile
-	stdair/basic/Makefile
-	stdair/bom/Makefile
-	stdair/dbadaptor/Makefile
-	stdair/factory/Makefile
-	stdair/command/Makefile
-	stdair/config/Makefile
-	stdair/service/Makefile
-	stdair/core/Makefile
-	stdair/batches/Makefile
 	simfqt/Makefile
 	simfqt/basic/Makefile
 	simfqt/bom/Makefile
@@ -265,10 +254,8 @@
 	simfqt/config/Makefile
 	simfqt/core/Makefile
 	simfqt/batches/Makefile
-	extracppunit/Makefile
 	test/Makefile
 	test/samples/Makefile
-	test/stdair/Makefile
 	test/simfqt/Makefile
 )
 AC_OUTPUT
@@ -343,6 +330,11 @@
     o SOCI_CFLAGS ..... : ${SOCI_CFLAGS}
     o SOCI_LIBS ....... : ${SOCI_LIBS}
 
+  - StdAir ............ :
+    o STDAIR_VERSION .. : ${STDAIR_VERSION}
+    o STDAIR_CFLAGS ... : ${STDAIR_CFLAGS}
+    o STDAIR_LIBS ..... : ${STDAIR_LIBS}
+
   - ExtraCC ........... :
     o EXTRACC_VERSION . : ${EXTRACC_VERSION}
     o EXTRACC_CFLAGS .. : ${EXTRACC_CFLAGS}

Modified: trunk/simfqt/simfqt/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -12,5 +12,5 @@
 
 
 # Header files
-nobase_pkginclude_HEADERS = $(service_h_sources)
+nobase_pkginclude_HEADERS = $(simfqt_service_h_sources)
 #nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h

Modified: trunk/simfqt/simfqt/basic/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/basic/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/basic/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,11 +1,14 @@
-## basic sub-directory
+## simfqt/basic sub-directory
 include $(top_srcdir)/Makefile.common
 include $(srcdir)/sources.mk
 
-noinst_LTLIBRARIES= libbas.la
+#
+noinst_LTLIBRARIES = libsimfqtbas.la
 
-libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources) 
-libbas_la_CXXFLAGS =
+libsimfqtbas_la_SOURCES = $(simfqt_bas_h_sources) $(simfqt_bas_cc_sources) 
+libsimfqtbas_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libsimfqtbas_la_LDFLAGS =
 
+#
 #pkgincludedir = $(includedir)/@PACKAGE@/basic
-#pkginclude_HEADERS = $(bas_h_sources)
+#pkginclude_HEADERS = $(simfqt_bas_h_sources)

Modified: trunk/simfqt/simfqt/basic/sources.mk
===================================================================
--- trunk/simfqt/simfqt/basic/sources.mk	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/basic/sources.mk	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,3 +1,5 @@
-bas_h_sources = $(top_srcdir)/simfqt/basic/BasConst_General.hpp \
-				$(top_srcdir)/simfqt/basic/BasConst_SIMFQT_Service.hpp
-bas_cc_sources = $(top_srcdir)/simfqt/basic/BasConst.cpp
+simfqt_bas_h_sources = \
+	$(top_srcdir)/simfqt/basic/BasConst_General.hpp \
+	$(top_srcdir)/simfqt/basic/BasConst_SIMFQT_Service.hpp
+simfqt_bas_cc_sources = \
+	$(top_srcdir)/simfqt/basic/BasConst.cpp

Modified: trunk/simfqt/simfqt/batches/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/batches/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/batches/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -10,6 +10,6 @@
 bin_PROGRAMS =
 
 #simfqt_SOURCES = $(batches_h_sources) $(batches_cc_sources)
-#simfqt_CXXFLAGS = $(BOOST_CFLAGS)
+#simfqt_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
 #simfqt_LDADD =
-#simfqt_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(top_builddir)/simfqt/core/libsimfqt.la
+#simfqt_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS) $(top_builddir)/simfqt/core/libsimfqt.la

Modified: trunk/simfqt/simfqt/bom/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/bom/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/bom/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,12 +1,14 @@
-## bom sub-directory
+## simfqt/bom sub-directory
 include $(top_srcdir)/Makefile.common
 include $(srcdir)/sources.mk
 
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES = libsimfqtbom.la
 
-libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources) 
-libbom_la_CXXFLAGS =
-libbom_la_LDFLAGS =
+libsimfqtbom_la_SOURCES = $(simfqt_bom_h_sources) $(simfqt_bom_cc_sources) 
+libsimfqtbom_la_CXXFLAGS =
+libsimfqtbom_la_LDFLAGS =
 
+#
 #pkgincludedir = $(includedir)/@PACKAGE@/bom
-#pkginclude_HEADERS = $(bom_h_sources)
+#pkginclude_HEADERS = $(simfqt_bom_h_sources)

Modified: trunk/simfqt/simfqt/bom/sources.mk
===================================================================
--- trunk/simfqt/simfqt/bom/sources.mk	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/bom/sources.mk	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,2 +1,4 @@
-bom_h_sources = $(top_srcdir)/simfqt/bom/BomAbstract.hpp
-bom_cc_sources = $(top_srcdir)/simfqt/bom/BomAbstract.cpp
+simfqt_bom_h_sources = \
+	$(top_srcdir)/simfqt/bom/BomAbstract.hpp
+simfqt_bom_cc_sources = \
+	$(top_srcdir)/simfqt/bom/BomAbstract.cpp

Modified: trunk/simfqt/simfqt/command/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/command/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/command/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,13 +1,15 @@
-## command sub-directory
+## simfqt/command sub-directory
 include $(top_srcdir)/Makefile.common
 include $(srcdir)/sources.mk
 
-noinst_LTLIBRARIES= libcmd.la
+#
+noinst_LTLIBRARIES = libsimfqtcmd.la
 
-libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources) 
-libcmd_la_CXXFLAGS = $(BOOST_CFLAGS)
-libcmd_la_LIBADD =
-libcmd_la_LDFLAGS = $(BOOST_LIBS)
+libsimfqtcmd_la_SOURCES= $(simfqt_cmd_h_sources) $(simfqt_cmd_cc_sources) 
+libsimfqtcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+libsimfqtcmd_la_LIBADD =
+libsimfqtcmd_la_LDFLAGS =
 
+#
 #pkgincludedir = $(includedir)/@PACKAGE@/command
-#pkginclude_HEADERS = $(cmd_h_sources)
+#pkginclude_HEADERS = $(simfqt_cmd_h_sources)

Modified: trunk/simfqt/simfqt/command/sources.mk
===================================================================
--- trunk/simfqt/simfqt/command/sources.mk	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/command/sources.mk	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,4 +1,4 @@
-cmd_h_sources = \
-			$(top_srcdir)/simfqt/command/FareQuoter.hpp
-cmd_cc_sources = \
-			$(top_srcdir)/simfqt/command/FareQuoter.cpp
+simfqt_cmd_h_sources = \
+	$(top_srcdir)/simfqt/command/FareQuoter.hpp
+simfqt_cmd_cc_sources = \
+	$(top_srcdir)/simfqt/command/FareQuoter.cpp

Modified: trunk/simfqt/simfqt/core/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/core/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/core/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -12,19 +12,17 @@
 # Library
 lib_LTLIBRARIES = libsimfqt.la
 
-libsimfqt_la_SOURCES = $(service_h_sources) $(service_cc_sources)
+libsimfqt_la_SOURCES = $(simfqt_service_h_sources) $(simfqt_service_cc_sources)
 libsimfqt_la_LIBADD = \
-	$(top_builddir)/simfqt/basic/libbas.la \
-	$(top_builddir)/simfqt/bom/libbom.la \
-	$(top_builddir)/simfqt/factory/libfac.la \
-	$(top_builddir)/simfqt/command/libcmd.la \
-	$(top_builddir)/simfqt/service/libsvc.la
+	$(top_builddir)/simfqt/basic/libsimfqtbas.la \
+	$(top_builddir)/simfqt/bom/libsimfqtbom.la \
+	$(top_builddir)/simfqt/factory/libsimfqtfac.la \
+	$(top_builddir)/simfqt/command/libsimfqtcmd.la \
+	$(top_builddir)/simfqt/service/libsimfqtsvc.la
 libsimfqt_la_LDFLAGS = \
-	$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS) \
 	-version-info $(GENERIC_LIBRARY_VERSION)
 
 # Header files
-#pkginclude_HEADERS = $(service_h_sources)
+#pkginclude_HEADERS = $(simfqt_service_h_sources)
 #nobase_nodist_pkginclude_HEADERS = $(top_builddir)/simfqt/config.h
-

Modified: trunk/simfqt/simfqt/core/sources.mk
===================================================================
--- trunk/simfqt/simfqt/core/sources.mk	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/core/sources.mk	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,4 +1,4 @@
-service_h_sources = \
-                $(top_srcdir)/simfqt/SIMFQT_Types.hpp \
-                $(top_srcdir)/simfqt/SIMFQT_Service.hpp
-service_cc_sources =
+simfqt_service_h_sources = \
+	$(top_srcdir)/simfqt/SIMFQT_Types.hpp \
+	$(top_srcdir)/simfqt/SIMFQT_Service.hpp
+simfqt_service_cc_sources =

Modified: trunk/simfqt/simfqt/factory/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/factory/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/factory/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,11 +1,14 @@
-## factory sub-directory
+## simfqt/factory sub-directory
 include $(top_srcdir)/Makefile.common
 include $(srcdir)/sources.mk
 
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES = libsimfqtfac.la
 
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources) 
-libfac_la_CXXFLAGS =
+libsimfqtfac_la_SOURCES= $(simfqt_fac_h_sources) $(simfqt_fac_cc_sources) 
+libsimfqtfac_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libsimfqtfac_la_LDFLAGS =
 
+#
 #pkgincludedir = $(includedir)/@PACKAGE@/factory
-#pkginclude_HEADERS = $(fac_h_sources)
+#pkginclude_HEADERS = $(simfqt_fac_h_sources)

Modified: trunk/simfqt/simfqt/factory/sources.mk
===================================================================
--- trunk/simfqt/simfqt/factory/sources.mk	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/factory/sources.mk	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,10 +1,10 @@
-fac_h_sources = \
-		$(top_srcdir)/simfqt/factory/FacBomAbstract.hpp \
-		$(top_srcdir)/simfqt/factory/FacServiceAbstract.hpp \
-		$(top_srcdir)/simfqt/factory/FacSupervisor.hpp \
-		$(top_srcdir)/simfqt/factory/FacSimfqtServiceContext.hpp
-fac_cc_sources = \
-		$(top_srcdir)/simfqt/factory/FacBomAbstract.cpp \
-		$(top_srcdir)/simfqt/factory/FacServiceAbstract.cpp \
-		$(top_srcdir)/simfqt/factory/FacSupervisor.cpp \
-		$(top_srcdir)/simfqt/factory/FacSimfqtServiceContext.cpp
+simfqt_fac_h_sources = \
+	$(top_srcdir)/simfqt/factory/FacBomAbstract.hpp \
+	$(top_srcdir)/simfqt/factory/FacServiceAbstract.hpp \
+	$(top_srcdir)/simfqt/factory/FacSupervisor.hpp \
+	$(top_srcdir)/simfqt/factory/FacSimfqtServiceContext.hpp
+simfqt_fac_cc_sources = \
+	$(top_srcdir)/simfqt/factory/FacBomAbstract.cpp \
+	$(top_srcdir)/simfqt/factory/FacServiceAbstract.cpp \
+	$(top_srcdir)/simfqt/factory/FacSupervisor.cpp \
+	$(top_srcdir)/simfqt/factory/FacSimfqtServiceContext.cpp

Modified: trunk/simfqt/simfqt/service/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/service/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/service/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,11 +1,14 @@
-## command sub-directory
+## simfqt/service sub-directory
 include $(top_srcdir)/Makefile.common
 include $(srcdir)/sources.mk
 
-noinst_LTLIBRARIES= libsvc.la
+#
+noinst_LTLIBRARIES = libsimfqtsvc.la
 
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources) 
-libsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libsimfqtsvc_la_SOURCES= $(simfqt_svc_h_sources) $(simfqt_svc_cc_sources) 
+libsimfqtsvc_la_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+libsimfqtsvc_la_LDFLAGS =
 
+#
 #pkgincludedir = $(includedir)/@PACKAGE@/service
-#pkginclude_HEADERS = $(svc_h_sources)
+#pkginclude_HEADERS = $(simfqt_svc_h_sources)

Modified: trunk/simfqt/simfqt/service/sources.mk
===================================================================
--- trunk/simfqt/simfqt/service/sources.mk	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/simfqt/service/sources.mk	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,5 +1,7 @@
-svc_h_sources = $(top_srcdir)/simfqt/service/ServiceAbstract.hpp \
-				$(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.hpp
-svc_cc_sources = $(top_srcdir)/simfqt/service/ServiceAbstract.cpp \
-				$(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.cpp \
-				$(top_srcdir)/simfqt/service/SIMFQT_Service.cpp
+simfqt_svc_h_sources = \
+	$(top_srcdir)/simfqt/service/ServiceAbstract.hpp \
+	$(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.hpp
+simfqt_svc_cc_sources = \
+	$(top_srcdir)/simfqt/service/ServiceAbstract.cpp \
+	$(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.cpp \
+	$(top_srcdir)/simfqt/service/SIMFQT_Service.cpp


Property changes on: trunk/simfqt/test
___________________________________________________________________
Modified: svn:externals
   - samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/stdair


   + samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples



Modified: trunk/simfqt/test/Makefile.am
===================================================================
--- trunk/simfqt/test/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/test/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -1,10 +1,10 @@
-## test sub-directory
+## test sub-directory of the SimFQT project
 include $(top_srcdir)/Makefile.common
 
 MAINTAINERCLEANFILES = Makefile.in
 
 ##
-SUBDIRS = samples stdair simfqt
+SUBDIRS = samples simfqt
 
 EXTRA_DIST =
 
@@ -12,4 +12,3 @@
 check_PROGRAMS =
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = #
-

Modified: trunk/simfqt/test/simfqt/Makefile.am
===================================================================
--- trunk/simfqt/test/simfqt/Makefile.am	2010-08-20 10:48:33 UTC (rev 13)
+++ trunk/simfqt/test/simfqt/Makefile.am	2010-09-07 09:57:32 UTC (rev 14)
@@ -14,11 +14,8 @@
 XFAIL_TESTS = #
 
 FQTTestSuite_SOURCES = FQTTestSuite.hpp FQTTestSuite.cpp
-FQTTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
+FQTTestSuite_CXXFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS) \
+	$(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
 FQTTestSuite_LDADD =
-FQTTestSuite_LDFLAGS = \
-		$(BOOST_LIBS) $(CPPUNIT_LIBS) \
-		$(top_builddir)/extracppunit/libextracppunit.la \
-		$(top_builddir)/stdair/core/libstdair.la \
-		$(top_builddir)/simfqt/core/libsimfqt.la
-
+FQTTestSuite_LDFLAGS = $(CPPUNIT_LIBS) $(EXTRACC_LIBS) $(STDAIR_LIBS) \
+	$(top_builddir)/simfqt/core/libsimfqt.la


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


