Menu
▾
▴
[Dsim-svn] SF.net SVN: dsim:[103] trunk/dsim
|
From: <den...@us...> - 2010-07-20 23:08:59
|
Revision: 103
http://dsim.svn.sourceforge.net/dsim/?rev=103&view=rev
Author: denis_arnaud
Date: 2010-07-20 23:08:53 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
[Doc] Prefixed the source file variables with stdair.
Modified Paths:
--------------
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/basic/Makefile.am
trunk/dsim/dsim/basic/sources.mk
trunk/dsim/dsim/batches/Makefile.am
trunk/dsim/dsim/batches/sources.mk
trunk/dsim/dsim/bom/Makefile.am
trunk/dsim/dsim/bom/sources.mk
trunk/dsim/dsim/command/Makefile.am
trunk/dsim/dsim/command/sources.mk
trunk/dsim/dsim/config/Makefile.am
trunk/dsim/dsim/core/Makefile.am
trunk/dsim/dsim/core/sources.mk
trunk/dsim/dsim/factory/Makefile.am
trunk/dsim/dsim/factory/sources.mk
trunk/dsim/dsim/service/Makefile.am
trunk/dsim/dsim/service/sources.mk
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/doc/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,13 +1,14 @@
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/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/command/sources.mk
-#include $(top_srcdir)/stdair/service/sources.mk
-#include $(top_srcdir)/stdair/core/sources.mk
-#include $(top_srcdir)/stdair/batches/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/core/sources.mk
+include $(top_srcdir)/stdair/batches/sources.mk
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
#include $(top_srcdir)/trademgen/factory/sources.mk
@@ -94,11 +95,18 @@
html/index.html: doxygen_html.cfg \
$(doc_local_sources) $(html_local_sources) \
$(doc_tutorial_sources) $(cpp_tutorial_sources) \
- $(bas_h_sources) $(bas_cc_sources) \
- $(bom_h_sources) $(bom_cc_sources) \
- $(fac_h_sources) $(fac_cc_sources) \
- $(cmd_h_sources) $(cmd_cc_sources) \
- $(svc_h_sources) $(svc_cc_sources)
+ $(stdair_service_h_sources) $(stdair_service_cc_sources) \
+ $(stdair_bas_h_sources) $(stdair_bas_cc_sources) \
+ $(stdair_bom_h_sources) $(stdair_bom_cc_sources) \
+ $(stdair_fac_h_sources) $(stdair_fac_cc_sources) \
+ $(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
+ $(stdair_svc_h_sources) $(stdair_svc_cc_sources) \
+ $(dsim_service_h_sources) $(dsim_service_cc_sources) \
+ $(dsim_bas_h_sources) $(dsim_bas_cc_sources) \
+ $(dsim_bom_h_sources) $(dsim_bom_cc_sources) \
+ $(dsim_fac_h_sources) $(dsim_fac_cc_sources) \
+ $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources) \
+ $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
doxygen $<; \
if test -d html; then \
cp $(srcdir)/images/dsim_logo.png html; \
Modified: trunk/dsim/dsim/basic/Makefile.am
===================================================================
--- trunk/dsim/dsim/basic/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/basic/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## basic sub-directory
+## dsim/basic sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbas.la
+#
+noinst_LTLIBRARIES = libdsimbas.la
-libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources)
-libbas_la_CXXFLAGS =
+libdsimbas_la_SOURCES = $(dsim_bas_h_sources) $(dsim_bas_cc_sources)
+libdsim_bas_la_CXXFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/basic
#pkginclude_HEADERS = $(bas_h_sources)
Modified: trunk/dsim/dsim/basic/sources.mk
===================================================================
--- trunk/dsim/dsim/basic/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/basic/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,3 +1,5 @@
-bas_h_sources = $(top_srcdir)/dsim/basic/BasConst_General.hpp \
- $(top_srcdir)/dsim/basic/BasConst_DSIM_Service.hpp
-bas_cc_sources = $(top_srcdir)/dsim/basic/BasConst.cpp
+dsim_bas_h_sources = \
+ $(top_srcdir)/dsim/basic/BasConst_General.hpp \
+ $(top_srcdir)/dsim/basic/BasConst_DSIM_Service.hpp
+dsim_bas_cc_sources = \
+ $(top_srcdir)/dsim/basic/BasConst.cpp
Modified: trunk/dsim/dsim/batches/Makefile.am
===================================================================
--- trunk/dsim/dsim/batches/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/batches/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# batches
+# dsim/batches
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -10,7 +10,7 @@
# Binaries (batches)
bin_PROGRAMS = simulate
-simulate_SOURCES = $(batches_h_sources) $(batches_cc_sources)
+simulate_SOURCES = $(dsim_batches_h_sources) $(dsim_batches_cc_sources)
simulate_CXXFLAGS = $(BOOST_CFLAGS)
simulate_LDADD =
simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) \
Modified: trunk/dsim/dsim/batches/sources.mk
===================================================================
--- trunk/dsim/dsim/batches/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/batches/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,2 +1,2 @@
-batches_h_sources =
-batches_cc_sources = $(top_srcdir)/dsim/batches/simulate.cpp
+dsim_batches_h_sources =
+dsim_batches_cc_sources = $(top_srcdir)/dsim/batches/simulate.cpp
Modified: trunk/dsim/dsim/bom/Makefile.am
===================================================================
--- trunk/dsim/dsim/bom/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/bom/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,12 +1,14 @@
-## bom sub-directory
+## dsim/bom sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES= libdsimbom.la
-libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources)
-libbom_la_CXXFLAGS =
-libbom_la_LDFLAGS =
+libdsimbom_la_SOURCES= $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
+libdsimbom_la_CXXFLAGS =
+libdsimbom_la_LDFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/bom
#pkginclude_HEADERS = $(bom_h_sources)
Modified: trunk/dsim/dsim/bom/sources.mk
===================================================================
--- trunk/dsim/dsim/bom/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/bom/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,7 +1,9 @@
-bom_h_sources = $(top_srcdir)/dsim/bom/BomAbstract.hpp \
- $(top_srcdir)/dsim/bom/StructAbstract.hpp \
- $(top_srcdir)/dsim/bom/ConfigurationParameters.hpp \
- $(top_srcdir)/dsim/bom/RDSParameters.hpp
-bom_cc_sources = $(top_srcdir)/dsim/bom/BomAbstract.cpp \
- $(top_srcdir)/dsim/bom/ConfigurationParameters.cpp \
- $(top_srcdir)/dsim/bom/RDSParameters.cpp
+dsim_bom_h_sources = \
+ $(top_srcdir)/dsim/bom/BomAbstract.hpp \
+ $(top_srcdir)/dsim/bom/StructAbstract.hpp \
+ $(top_srcdir)/dsim/bom/ConfigurationParameters.hpp \
+ $(top_srcdir)/dsim/bom/RDSParameters.hpp
+dsim_bom_cc_sources = \
+ $(top_srcdir)/dsim/bom/BomAbstract.cpp \
+ $(top_srcdir)/dsim/bom/ConfigurationParameters.cpp \
+ $(top_srcdir)/dsim/bom/RDSParameters.cpp
Modified: trunk/dsim/dsim/command/Makefile.am
===================================================================
--- trunk/dsim/dsim/command/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/command/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,13 +1,14 @@
-## command sub-directory
+## dsim/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libcmd.la
+#
+noinst_LTLIBRARIES = libdsimcmd.la
-libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
-libcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
-libcmd_la_LIBADD =
-libcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
+libdsimcmd_la_SOURCES = $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources)
+libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
+libdsimcmd_la_LIBADD =
+libdsimcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
$(top_builddir)/simcrs/core/libsimcrs.la \
$(top_builddir)/trademgen/core/libtrademgen.la
Modified: trunk/dsim/dsim/command/sources.mk
===================================================================
--- trunk/dsim/dsim/command/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/command/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,8 +1,8 @@
-cmd_h_sources = \
+dsim_cmd_h_sources = \
$(top_srcdir)/dsim/command/CmdAbstract.hpp \
$(top_srcdir)/dsim/command/DBManager.hpp \
$(top_srcdir)/dsim/command/Simulator.hpp
-cmd_cc_sources = \
+dsim_cmd_cc_sources = \
$(top_srcdir)/dsim/command/CmdAbstract.cpp \
$(top_srcdir)/dsim/command/DBManager.cpp \
$(top_srcdir)/dsim/command/Simulator.cpp
\ No newline at end of file
Modified: trunk/dsim/dsim/config/Makefile.am
===================================================================
--- trunk/dsim/dsim/config/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/config/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# config
+# dsim/config
include $(top_srcdir)/Makefile.common
## Source directory
Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/core/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# core
+# dsim/core
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -12,15 +12,16 @@
# Library
lib_LTLIBRARIES = libdsim.la
-libdsim_la_SOURCES = $(service_h_sources) $(service_cc_sources)
+libdsim_la_SOURCES = $(dsim_service_h_sources) $(dsim_service_cc_sources)
libdsim_la_LIBADD = \
- $(top_builddir)/dsim/basic/libbas.la \
- $(top_builddir)/dsim/bom/libbom.la \
- $(top_builddir)/dsim/factory/libfac.la \
- $(top_builddir)/dsim/command/libcmd.la \
- $(top_builddir)/dsim/service/libsvc.la
+ $(top_builddir)/dsim/basic/libdsimbas.la \
+ $(top_builddir)/dsim/bom/libdsimbom.la \
+ $(top_builddir)/dsim/factory/libdsimfac.la \
+ $(top_builddir)/dsim/command/libdsimcmd.la \
+ $(top_builddir)/dsim/service/libdsimsvc.la
libdsim_la_LDFLAGS = \
- $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) \
+ $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_FILESYSTEM_LIB) \
$(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la \
$(top_builddir)/simcrs/core/libsimcrs.la \
Modified: trunk/dsim/dsim/core/sources.mk
===================================================================
--- trunk/dsim/dsim/core/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/core/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-service_h_sources = \
- $(top_srcdir)/dsim/DSIM_Types.hpp \
- $(top_srcdir)/dsim/DSIM_Service.hpp
-service_cc_sources =
+dsim_service_h_sources = \
+ $(top_srcdir)/dsim/DSIM_Types.hpp \
+ $(top_srcdir)/dsim/DSIM_Service.hpp
+dsim_service_cc_sources =
Modified: trunk/dsim/dsim/factory/Makefile.am
===================================================================
--- trunk/dsim/dsim/factory/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/factory/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## factory sub-directory
+## dsim/factory sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES= libdsimfac.la
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
-libfac_la_CXXFLAGS =
+libdsimfac_la_SOURCES= $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
+libdsimfac_la_CXXFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/factory
#pkginclude_HEADERS = $(fac_h_sources)
Modified: trunk/dsim/dsim/factory/sources.mk
===================================================================
--- trunk/dsim/dsim/factory/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/factory/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,9 +1,9 @@
-fac_h_sources = \
+dsim_fac_h_sources = \
$(top_srcdir)/dsim/factory/FacBomAbstract.hpp \
$(top_srcdir)/dsim/factory/FacServiceAbstract.hpp \
$(top_srcdir)/dsim/factory/FacSupervisor.hpp \
$(top_srcdir)/dsim/factory/FacDsimServiceContext.hpp
-fac_cc_sources = \
+dsim_fac_cc_sources = \
$(top_srcdir)/dsim/factory/FacBomAbstract.cpp \
$(top_srcdir)/dsim/factory/FacServiceAbstract.cpp \
$(top_srcdir)/dsim/factory/FacSupervisor.cpp \
Modified: trunk/dsim/dsim/service/Makefile.am
===================================================================
--- trunk/dsim/dsim/service/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/service/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## command sub-directory
+## dsim/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libsvc.la
+#
+noinst_LTLIBRARIES = libdsimsvc.la
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources)
-libsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libdsimsvc_la_SOURCES = $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
+libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+
#pkgincludedir = $(includedir)/@PACKAGE@/service
#pkginclude_HEADERS = $(svc_h_sources)
Modified: trunk/dsim/dsim/service/sources.mk
===================================================================
--- trunk/dsim/dsim/service/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/service/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,5 +1,7 @@
-svc_h_sources = $(top_srcdir)/dsim/service/ServiceAbstract.hpp \
- $(top_srcdir)/dsim/service/DSIM_ServiceContext.hpp
-svc_cc_sources = $(top_srcdir)/dsim/service/ServiceAbstract.cpp \
- $(top_srcdir)/dsim/service/DSIM_ServiceContext.cpp \
- $(top_srcdir)/dsim/service/DSIM_Service.cpp
+dsim_svc_h_sources = \
+ $(top_srcdir)/dsim/service/ServiceAbstract.hpp \
+ $(top_srcdir)/dsim/service/DSIM_ServiceContext.hpp
+dsim_svc_cc_sources = \
+ $(top_srcdir)/dsim/service/ServiceAbstract.cpp \
+ $(top_srcdir)/dsim/service/DSIM_ServiceContext.cpp \
+ $(top_srcdir)/dsim/service/DSIM_Service.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
