[Dsim-svn] SF.net SVN: dsim:[122] trunk/dsim

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

Revision: 122
          http://dsim.svn.sourceforge.net/dsim/?rev=122&view=rev
Author:   clacombe
Date:     2010-09-06 15:56:17 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
[Config] keep stdair directory for the lib creation only

Modified Paths:
--------------
    trunk/dsim/configure.ac
    trunk/dsim/doc/Makefile.am
    trunk/dsim/dsim/Makefile.am
    trunk/dsim/dsim/core/Makefile.am
    trunk/dsim/test/boost/mpi/log_server/Makefile.am
    trunk/dsim/test/dsim/Makefile.am
    trunk/dsim/test/master_slave/Makefile.am

Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/configure.ac	2010-09-06 15:56:17 UTC (rev 122)
@@ -388,7 +388,6 @@
 	stdair/command/Makefile
 	stdair/config/Makefile
 	stdair/service/Makefile
-	stdair/core/Makefile
 	stdair/batches/Makefile
 	trademgen/Makefile
 	trademgen/basic/Makefile

Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/doc/Makefile.am	2010-09-06 15:56:17 UTC (rev 122)
@@ -9,7 +9,7 @@
 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/core/sources.mk
+include $(top_srcdir)/stdair/sources.mk
 include $(top_srcdir)/stdair/batches/sources.mk
 # TraDemGen
 #include $(top_srcdir)/trademgen/basic/sources.mk

Modified: trunk/dsim/dsim/Makefile.am
===================================================================
--- trunk/dsim/dsim/Makefile.am	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/dsim/Makefile.am	2010-09-06 15:56:17 UTC (rev 122)
@@ -6,7 +6,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = basic bom factory command service core config batches
+SUBDIRS = basic bom factory command service config batches
 
 EXTRA_DIST = config_msvc.h
 

Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/dsim/core/Makefile.am	2010-09-06 15:56:17 UTC (rev 122)
@@ -22,7 +22,7 @@
 libdsim_la_LDFLAGS = \
 	$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
 	$(BOOST_FILESYSTEM_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(top_builddir)/stdair/libstdair.la \
 	$(top_builddir)/airsched/core/libairsched.la \
 	$(top_builddir)/simcrs/core/libsimcrs.la \
 	$(top_builddir)/trademgen/core/libtrademgen.la \

Modified: trunk/dsim/test/boost/mpi/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/Makefile.am	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/test/boost/mpi/log_server/Makefile.am	2010-09-06 15:56:17 UTC (rev 122)
@@ -15,7 +15,7 @@
 log_server_SOURCES = log_server.cpp
 log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
 log_server_LDFLAGS = $(BOOST_LIBS) $(BOOST_MPI_LIB) \
-			$(top_builddir)/stdair/core/libstdair.la \
+			$(top_builddir)/stdair/libstdair.la \
 			$(top_builddir)/airsched/core/libairsched.la
 
 #

Modified: trunk/dsim/test/dsim/Makefile.am
===================================================================
--- trunk/dsim/test/dsim/Makefile.am	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/test/dsim/Makefile.am	2010-09-06 15:56:17 UTC (rev 122)
@@ -19,5 +19,5 @@
 SimulationTestSuite_LDFLAGS = \
 		$(BOOST_LIBS) $(CPPUNIT_LIBS) \
 		$(top_builddir)/extracppunit/libextracppunit.la \
-		$(top_builddir)/stdair/core/libstdair.la \
+		$(top_builddir)/stdair/libstdair.la \
 		$(top_builddir)/dsim/core/libdsim.la

Modified: trunk/dsim/test/master_slave/Makefile.am
===================================================================
--- trunk/dsim/test/master_slave/Makefile.am	2010-08-30 12:58:03 UTC (rev 121)
+++ trunk/dsim/test/master_slave/Makefile.am	2010-09-06 15:56:17 UTC (rev 122)
@@ -13,7 +13,7 @@
 master_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
 master_LDADD =
 master_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(top_builddir)/stdair/libstdair.la \
 	$(top_builddir)/airsched/core/libairsched.la
 
 
@@ -21,7 +21,7 @@
 slave_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
 slave_LDADD =
 slave_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(top_builddir)/stdair/libstdair.la \
 	$(top_builddir)/airsched/core/libairsched.la
 
 
@@ -29,5 +29,5 @@
 log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
 log_server_LDADD =
 log_server_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la \
+	$(top_builddir)/stdair/libstdair.la \
 	$(top_builddir)/airsched/core/libairsched.la


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