Menu
▾
▴
[Dsim-svn] SF.net SVN: dsim:[124] trunk/dsim
|
From: <den...@us...> - 2010-09-07 11:30:47
|
Revision: 124
http://dsim.svn.sourceforge.net/dsim/?rev=124&view=rev
Author: denis_arnaud
Date: 2010-09-07 11:30:40 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
[Build] The StdAir and ExtraCC projects are no longer Subversion external references.
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/configure.ac
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/DSIM_Service.hpp
trunk/dsim/dsim/Makefile.am
trunk/dsim/dsim/basic/Makefile.am
trunk/dsim/dsim/batches/Makefile.am
trunk/dsim/dsim/bom/Makefile.am
trunk/dsim/dsim/command/Makefile.am
trunk/dsim/dsim/core/Makefile.am
trunk/dsim/dsim/factory/Makefile.am
trunk/dsim/dsim/service/Makefile.am
trunk/dsim/test/Makefile.am
trunk/dsim/test/dsim/Makefile.am
Property Changed:
----------------
trunk/dsim/
trunk/dsim/test/
Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:externals
- config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
db https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/db
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
db https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/db
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -21,12 +21,17 @@
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 trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
- travelccm dsim $(HTML_DOC_DIR) extracppunit $(TEST_DIR)
+SUBDIRS = trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
+ travelccm dsim $(HTML_DOC_DIR) $(TEST_DIR)
# Configuration helpers
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/configure.ac 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,18 +3,14 @@
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
AC_INIT([DSIM],[99.99.99],[den...@us...],[dsim])
-AC_CONFIG_HEADER([stdair/config.h])
-AC_CONFIG_SRCDIR([stdair/basic/BasConst.cpp])
+AC_CONFIG_HEADER([dsim/DSIM_Service.hpp])
+AC_CONFIG_SRCDIR([dsim])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config])
AM_INIT_AUTOMAKE
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 for the main library
GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
@@ -123,10 +119,10 @@
# 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)
# -----------------------------------------------------------------------------
# Support for the GSL (GNU Scientific Library): http://www.gnu.org/software/gsl
@@ -198,6 +194,14 @@
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 TRAVEL-CCM (CCM Open Library): http://sf.net/projects/travel-ccm
# --------------------------------------------------------------------
@@ -379,15 +383,6 @@
dsim-config
dsim.m4
dsim.pc
- dsim.spec
- stdair/Makefile
- stdair/basic/Makefile
- stdair/bom/Makefile
- stdair/dbadaptor/Makefile
- stdair/factory/Makefile
- stdair/command/Makefile
- stdair/config/Makefile
- stdair/service/Makefile
trademgen/Makefile
trademgen/basic/Makefile
trademgen/bom/Makefile
@@ -482,7 +477,6 @@
dsim/config/Makefile
dsim/core/Makefile
dsim/batches/Makefile
- extracppunit/Makefile
doc/Makefile
doc/images/Makefile
doc/tutorial/Makefile
@@ -511,7 +505,6 @@
test/boost/serialization/Makefile
test/boost/signals/Makefile
test/boost/smart_pointers/Makefile
- test/stdair/Makefile
test/trademgen/Makefile
test/airsched/Makefile
test/airrac/Makefile
@@ -633,6 +626,11 @@
o XERCES_CFLAGS ... : ${XERCES_CFLAGS}
o XERCES_LIBS ..... : ${XERCES_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/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/doc/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,13 +3,13 @@
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
# StdAir
-include $(top_srcdir)/stdair/basic/sources.mk
-include $(top_srcdir)/stdair/bom/sources.mk
-include $(top_srcdir)/stdair/factory/sources.mk
-include $(top_srcdir)/stdair/dbadaptor/sources.mk
-include $(top_srcdir)/stdair/command/sources.mk
-include $(top_srcdir)/stdair/service/sources.mk
-include $(top_srcdir)/stdair/sources.mk
+#include $(top_srcdir)/stdair/basic/sources.mk
+#include $(top_srcdir)/stdair/bom/sources.mk
+#include $(top_srcdir)/stdair/factory/sources.mk
+#include $(top_srcdir)/stdair/dbadaptor/sources.mk
+#include $(top_srcdir)/stdair/command/sources.mk
+#include $(top_srcdir)/stdair/service/sources.mk
+#include $(top_srcdir)/stdair/sources.mk
# TraDemGen
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
Modified: trunk/dsim/dsim/DSIM_Service.hpp
===================================================================
--- trunk/dsim/dsim/DSIM_Service.hpp 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/DSIM_Service.hpp 2010-09-07 11:30:40 UTC (rev 124)
@@ -1,113 +1,242 @@
-#ifndef __DSIM_SVC_DSIM_SERVICE_HPP
-#define __DSIM_SVC_DSIM_SERVICE_HPP
+/* dsim/DSIM_Service.hpp. Generated from DSIM_Service.hpp.in by configure. */
+/* dsim/DSIM_Service.hpp.in. Generated from configure.ac by autoheader. */
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// StdAir
-#include <stdair/STDAIR_Types.hpp>
-// Dsim
-#include <dsim/DSIM_Types.hpp>
-// Forward declarations.
-namespace stdair {
- class AirlineFeatureSet;
- class STDAIR_Service;
- struct BasLogParams;
- struct BasDBParams;
-}
+#ifndef CONFIG_H
+#define CONFIG_H
-namespace DSIM {
- // Forward declaration
- class DSIM_ServiceContext;
- struct RDSParameters;
-
- /** Interface for the DSIM Services. */
- class DSIM_Service {
- public:
- // ////////// Constructors and destructors //////////
- /** Constructor.
- <br>The init() method is called; see the corresponding documentation
- for more details.
- <br>A reference on an output stream is given, so that log
- outputs can be directed onto that stream.
- <br>Moreover, database connection parameters are given, so that a
- session can be created on the corresponding database.
- @param const stdair::BasLogParams& Parameters for the output log stream.
- @param const stdair::BasDBParams& Parameters for the database access.
- @param const stdair::Filename_T& Filename of the input schedule file.
- @param const stdair::Filename_T& Filename of the input demand file. */
- DSIM_Service (const stdair::BasLogParams&, const stdair::BasDBParams&,
- const stdair::Filename_T& iScheduleInputFilename,
- const stdair::Filename_T& iDemandInputFilenames);
+/* Define if you want exceptions handling */
+/* #undef DSIM_EXCEPTIONS */
- /** Constructor.
- <br>The init() method is called; see the corresponding documentation
- for more details.
- <br>Moreover, as no reference on any output stream is given,
- neither any database access parameter is given, it is assumed
- that the StdAir log service has already been initialised with
- the proper log output stream by some other methods in the
- calling chain (for instance, when the DSIM_Service is
- itself being initialised by another library service).
- @param const stdair::Filename_T& Filename of the input schedule file.
- @param const stdair::Filename_T& Filename of the input demand file. */
- DSIM_Service (stdair::STDAIR_ServicePtr_T,
- const stdair::Filename_T& iScheduleInputFilename,
- const stdair::Filename_T& iDemandInputFilenames);
+/* define if the Boost library is available */
+#define HAVE_BOOST /**/
- /** Destructor. */
- ~DSIM_Service();
+/* define if the Boost::Asio library is available */
+#define HAVE_BOOST_ASIO /**/
-
- public:
- // /////////// Business Methods /////////////
- /** Perform a simulation. */
- void simulate();
-
- /** Display the list of airlines. */
- void displayAirlineListFromDB() const;
+/* define if the Boost::Date_Time library is available */
+#define HAVE_BOOST_DATE_TIME /**/
-
- private:
- // /////// Construction and Destruction helper methods ///////
- /** Default constructor. */
- DSIM_Service ();
- /** Default copy constructor. */
- DSIM_Service (const DSIM_Service&);
+/* define if the Boost::FILESYSTEM library is available */
+#define HAVE_BOOST_FILESYSTEM /**/
- /** Initialise the (DSIM) service context (i.e., the
- DSIM_ServiceContext object). */
- void initServiceContext ();
+/* define if the Boost::IOStreams library is available */
+#define HAVE_BOOST_IOSTREAMS /**/
- /** Initialise the STDAIR service (including the log service).
- <br>A reference on the root of the BOM tree, namely the BomRoot object,
- is stored within the service context for later use.
- @param const stdair::BasLogParams& Parameters for the output log stream.
- @param const stdair::BasDBParams& Parameters for the database access.
- @param const stdair::AirlineFeatureSet& Set of airline features. */
- void initStdAirService (const stdair::BasLogParams&,
- const stdair::BasDBParams&);
-
- /** Initialise.
- <br>The CSV file, describing the airline schedules for the
- simulator, is parsed and the inventories are generated accordingly.
- @param const stdair::AirlineFeatureSet& Set of airline features.
- @param const stdair::Filename_T& Filename of the input schedule file.
- @param const stdair::Filename_T& Filename of the input demand file. */
- void init (const stdair::Filename_T& iScheduleInputFilename,
- const stdair::Filename_T& iDemandInputFilename);
-
- /** Finalise. */
- void finalise ();
+/* define if the Boost::Mpi library is available */
+#define HAVE_BOOST_MPI /**/
-
- private:
- // ///////// Service Context /////////
- /** Dsim context. */
- DSIM_ServiceContext* _dsimServiceContext;
+/* define if the Boost::Mpi_Python library is available */
+#define HAVE_BOOST_MPI_PYTHON /**/
- };
-}
-#endif // __DSIM_SVC_DSIM_SERVICE_HPP
+/* define if the Boost::PROGRAM_OPTIONS library is available */
+#define HAVE_BOOST_PROGRAM_OPTIONS /**/
+
+/* define if the Boost::Regex library is available */
+#define HAVE_BOOST_REGEX /**/
+
+/* define if the Boost::Serialization library is available */
+#define HAVE_BOOST_SERIALIZATION /**/
+
+/* define if the Boost::Signals library is available */
+#define HAVE_BOOST_SIGNALS /**/
+
+/* define if the Boost::SYSTEM library is available */
+#define HAVE_BOOST_SYSTEM /**/
+
+/* define if the Boost::THREAD library is available */
+#define HAVE_BOOST_THREAD /**/
+
+/* define if the Boost::Unit_test_framework library is available */
+#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/
+
+/* Define to 1 if you have the <cmath> header file. */
+#define HAVE_CMATH 1
+
+/* Define to 1 if you have the declaration of `signgam', and to 0 if you
+ don't. */
+#define HAVE_DECL_SIGNGAM 1
+
+/* Define to 1 if you have the <deque> header file. */
+#define HAVE_DEQUE 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `erf' function. */
+#define HAVE_ERF 1
+
+/* Define to 1 if you have the `erfc' function. */
+#define HAVE_ERFC 1
+
+/* Define to 1 if you have the `finite' function. */
+#define HAVE_FINITE 1
+
+/* Define to 1 if you have the `fpclass' function. */
+/* #undef HAVE_FPCLASS */
+
+/* Define to 1 if you have the <fstream> header file. */
+#define HAVE_FSTREAM 1
+
+/* Define to 1 if you have the <ieeefp.h> header file. */
+/* #undef HAVE_IEEEFP_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <iomanip> header file. */
+#define HAVE_IOMANIP 1
+
+/* Define to 1 if you have the <iostream> header file. */
+#define HAVE_IOSTREAM 1
+
+/* Define to 1 if you have the `isfinite' function. */
+/* #undef HAVE_ISFINITE */
+
+/* Define to 1 if you have the `isinf' function. */
+#define HAVE_ISINF 1
+
+/* Define to 1 if you have the `isnan' function. */
+#define HAVE_ISNAN 1
+
+/* Define to 1 if you have the `lgamma' function. */
+#define HAVE_LGAMMA 1
+
+/* Define to 1 if you have the <limits> header file. */
+#define HAVE_LIMITS 1
+
+/* Define to 1 if you have the <list> header file. */
+#define HAVE_LIST 1
+
+/* Define to 1 if you have the `log1p' function. */
+#define HAVE_LOG1P 1
+
+/* Define to 1 if you have the <map> header file. */
+#define HAVE_MAP 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <queue> header file. */
+#define HAVE_QUEUE 1
+
+/* Define to 1 if you have the `rint' function. */
+#define HAVE_RINT 1
+
+/* Define to 1 if you have the <sstream> header file. */
+#define HAVE_SSTREAM 1
+
+/* Define to 1 if you have the <stdexcept> header file. */
+#define HAVE_STDEXCEPT 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <string> header file. */
+#define HAVE_STRING 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the `tgamma' function. */
+#define HAVE_TGAMMA 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <vector> header file. */
+#define HAVE_VECTOR 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "dsim"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "den...@us..."
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "DSIM"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "DSIM 99.99.99"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "dsim"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "99.99.99"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Version number of package */
+#define VERSION "99.99.99"
+
+
+#if HAVE_CMATH
+# include <cmath>
+#endif
+
+/* Solaris uses <ieeefp.h> for declaring isnan() and finite() functions */
+#if HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+/* Microsoft Visual C++ .NET underscore prefixed functions */
+#if _MSC_VER
+# include <cfloat>
+# define HAVE_FINITE 1
+# define finite(x) _finite(x)
+# define HAVE_ISNAN 1
+# define isnan(x) _isnan(x)
+# define HAVE_FPCLASS 1
+# define fpclass(x) _fpclass(x)
+# define HAVE_JN 1
+# define jn(a, b) _jn(a, b)
+# define HAVE_YN 1
+# define yn(a, b) _yn(a, b)
+# define HAVE_J0 1
+# define j0(a) _j0(a)
+# define HAVE_J1 1
+# define j1(a) _j1(a)
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#if (! defined (HAVE_FINITE) && defined (HAVE_ISFINITE))
+# define HAVE_FINITE 1
+# define finite(a) isfinite(a)
+#endif
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#endif /* #ifndef CONFIG_H */
+
Modified: trunk/dsim/dsim/Makefile.am
===================================================================
--- trunk/dsim/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -12,5 +12,5 @@
# Header files
-nobase_pkginclude_HEADERS = $(service_h_sources)
+nobase_pkginclude_HEADERS = $(dsim_service_h_sources)
#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
Modified: trunk/dsim/dsim/basic/Makefile.am
===================================================================
--- trunk/dsim/dsim/basic/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/basic/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -6,8 +6,9 @@
noinst_LTLIBRARIES = libdsimbas.la
libdsimbas_la_SOURCES = $(dsim_bas_h_sources) $(dsim_bas_cc_sources)
-libdsim_bas_la_CXXFLAGS =
+libdsimbas_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libdsimbas_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/basic
-#pkginclude_HEADERS = $(bas_h_sources)
+#pkginclude_HEADERS = $(dsim_bas_h_sources)
Modified: trunk/dsim/dsim/batches/Makefile.am
===================================================================
--- trunk/dsim/dsim/batches/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/batches/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -11,7 +11,7 @@
bin_PROGRAMS = simulate
simulate_SOURCES = $(dsim_batches_h_sources) $(dsim_batches_cc_sources)
-simulate_CXXFLAGS = $(BOOST_CFLAGS)
+simulate_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
simulate_LDADD =
-simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) \
+simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) $(STDAIR_LIBS) \
$(top_builddir)/dsim/core/libdsim.la
Modified: trunk/dsim/dsim/bom/Makefile.am
===================================================================
--- trunk/dsim/dsim/bom/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/bom/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,12 +3,12 @@
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libdsimbom.la
+noinst_LTLIBRARIES = libdsimbom.la
-libdsimbom_la_SOURCES= $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
-libdsimbom_la_CXXFLAGS =
+libdsimbom_la_SOURCES = $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
+libdsimbom_la_CXXFLAGS = $(STDAIR_CFLAGS)
libdsimbom_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/bom
-#pkginclude_HEADERS = $(bom_h_sources)
+#pkginclude_HEADERS = $(dsim_bom_h_sources)
Modified: trunk/dsim/dsim/command/Makefile.am
===================================================================
--- trunk/dsim/dsim/command/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/command/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -6,12 +6,10 @@
noinst_LTLIBRARIES = libdsimcmd.la
libdsimcmd_la_SOURCES = $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources)
-libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
+libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS) $(STDAIR_CFLAGS)
libdsimcmd_la_LIBADD =
-libdsimcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
- $(top_builddir)/simcrs/core/libsimcrs.la \
- $(top_builddir)/trademgen/core/libtrademgen.la
+libdsimcmd_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/command
-#pkginclude_HEADERS = $(cmd_h_sources)
+#pkginclude_HEADERS = $(dsim_cmd_h_sources)
Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/core/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -21,8 +21,7 @@
$(top_builddir)/dsim/service/libdsimsvc.la
libdsim_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_FILESYSTEM_LIB) \
- $(top_builddir)/stdair/libstdair.la \
+ $(BOOST_FILESYSTEM_LIB) $(STDAIR_LIBS) \
$(top_builddir)/airsched/core/libairsched.la \
$(top_builddir)/simcrs/core/libsimcrs.la \
$(top_builddir)/trademgen/core/libtrademgen.la \
Modified: trunk/dsim/dsim/factory/Makefile.am
===================================================================
--- trunk/dsim/dsim/factory/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/factory/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -3,11 +3,12 @@
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libdsimfac.la
+noinst_LTLIBRARIES = libdsimfac.la
-libdsimfac_la_SOURCES= $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
-libdsimfac_la_CXXFLAGS =
+libdsimfac_la_SOURCES = $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
+libdsimfac_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libdsimfac_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/factory
-#pkginclude_HEADERS = $(fac_h_sources)
+#pkginclude_HEADERS = $(dsim_fac_h_sources)
Modified: trunk/dsim/dsim/service/Makefile.am
===================================================================
--- trunk/dsim/dsim/service/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/dsim/service/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -1,4 +1,4 @@
-## dsim/command sub-directory
+## dsim/service sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -6,8 +6,9 @@
noinst_LTLIBRARIES = libdsimsvc.la
libdsimsvc_la_SOURCES = $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
-libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+libdsimsvc_la_LDFLAGS =
-
+#
#pkgincludedir = $(includedir)/@PACKAGE@/service
-#pkginclude_HEADERS = $(svc_h_sources)
+#pkginclude_HEADERS = $(dsim_svc_h_sources)
Property changes on: trunk/dsim/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
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/test/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/test/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/test/avlcal
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/test/simfqt
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/test/airinv
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/test/rmol
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/test/simcrs
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/test/trademgen
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/test/travelccm
+ samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/test/airsched
airrac https://airrac.svn.sourceforge.net/svnroot/airrac/trunk/airrac/test/airrac
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/test/avlcal
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/test/simfqt
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/test/airinv
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/test/rmol
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/test/simcrs
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/test/trademgen
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/test/travelccm
Modified: trunk/dsim/test/Makefile.am
===================================================================
--- trunk/dsim/test/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/test/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -5,7 +5,7 @@
##
SUBDIRS = boost samples \
- stdair trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
+ trademgen airsched airrac rmol airinv avlcal simfqt simcrs \
travelccm dsim
EXTRA_DIST =
Modified: trunk/dsim/test/dsim/Makefile.am
===================================================================
--- trunk/dsim/test/dsim/Makefile.am 2010-09-06 16:05:51 UTC (rev 123)
+++ trunk/dsim/test/dsim/Makefile.am 2010-09-07 11:30:40 UTC (rev 124)
@@ -14,10 +14,8 @@
XFAIL_TESTS = #
SimulationTestSuite_SOURCES = SimulationTestSuite.hpp SimulationTestSuite.cpp
-SimulationTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
+SimulationTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
SimulationTestSuite_LDADD =
SimulationTestSuite_LDFLAGS = \
- $(BOOST_LIBS) $(CPPUNIT_LIBS) \
- $(top_builddir)/extracppunit/libextracppunit.la \
- $(top_builddir)/stdair/libstdair.la \
- $(top_builddir)/dsim/core/libdsim.la
+ $(BOOST_LIBS) $(CPPUNIT_LIBS) $(STDAIR_LIBS) $(EXTRACC_LIBS) \
+ $(top_builddir)/dsim/core/libdsim.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
