Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[223] trunk/stdair
|
From: <den...@us...> - 2010-07-20 22:51:39
|
Revision: 223
http://stdair.svn.sourceforge.net/stdair/?rev=223&view=rev
Author: denis_arnaud
Date: 2010-07-20 22:51:33 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
[Doc] Prefixed the source file variables with stdair.
Modified Paths:
--------------
trunk/stdair/Makefile.am
trunk/stdair/doc/Makefile.am
trunk/stdair/stdair/basic/Makefile.am
trunk/stdair/stdair/basic/sources.mk
trunk/stdair/stdair/batches/Makefile.am
trunk/stdair/stdair/batches/sources.mk
trunk/stdair/stdair/bom/Makefile.am
trunk/stdair/stdair/bom/sources.mk
trunk/stdair/stdair/command/Makefile.am
trunk/stdair/stdair/command/sources.mk
trunk/stdair/stdair/core/Makefile.am
trunk/stdair/stdair/dbadaptor/Makefile.am
trunk/stdair/stdair/dbadaptor/sources.mk
trunk/stdair/stdair/factory/Makefile.am
trunk/stdair/stdair/factory/sources.mk
trunk/stdair/stdair/service/Makefile.am
trunk/stdair/stdair/service/sources.mk
Modified: trunk/stdair/Makefile.am
===================================================================
--- trunk/stdair/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,4 +1,4 @@
-## top directory
+## stdair top directory
include $(top_srcdir)/Makefile.common
ACLOCAL_AMFLAGS = -I config
@@ -52,7 +52,7 @@
$(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
- $(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-html-doc-`date +"%Y%m%d"`
+ $(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-doc-`date +"%Y%m%d"`
upload: upload-src upload-html
@@ -61,6 +61,6 @@
@PACKAGE_TARNAME@-@VERSION@.tar.bz2
upload-html: dist-html
- @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-html-doc-@VERSION@.tar.gz \
- @PACKAGE_TARNAME@-html-doc-@VERSION@.tar.bz2
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-doc-@VERSION@.tar.bz2
Modified: trunk/stdair/doc/Makefile.am
===================================================================
--- trunk/stdair/doc/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/doc/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,18 +1,20 @@
+# stdair doc directory
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)/@PACKAGE@/basic/sources.mk
-include $(top_srcdir)/@PACKAGE@/bom/sources.mk
-include $(top_srcdir)/@PACKAGE@/factory/sources.mk
-#include $(top_srcdir)/@PACKAGE@/command/sources.mk
-#include $(top_srcdir)/@PACKAGE@/service/sources.mk
-include $(top_srcdir)/@PACKAGE@/core/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
SUBDIRS = images tutorial local
docdir = @docdir@
-html_tarname = @PACKAGE_TARNAME@-html-doc-@PACKAGE_VERSION@
+html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
noinst_DATA = sourceforge/howto_release_stdair.html.in
EXTRA_DIST = $(noinst_DATA)
@@ -25,13 +27,12 @@
html/index.html: doxygen_html.cfg \
$(doc_local_sources) $(html_local_sources) \
$(doc_tutorial_sources) $(cpp_tutorial_sources) \
- $(service_h_sources) $(service_cc_sources) \
- $(bas_h_sources) $(bas_cc_sources) \
- $(bom_h_sources) $(bom_cc_sources) \
- $(fac_h_sources) $(fac_cc_sources) \
- $(dba_h_sources) $(dba_cc_sources) \
- $(cmd_h_sources) $(cmd_cc_sources) \
- $(svc_h_sources) $(svc_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_dba_h_sources) $(stdair_dba_cc_sources) \
+ $(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
+ $(stdair_svc_h_sources) $(stdair_svc_cc_sources)
doxygen $<; \
if test -d html; then \
cp $(srcdir)/images/stdair_logo.png html; \
Modified: trunk/stdair/stdair/basic/Makefile.am
===================================================================
--- trunk/stdair/stdair/basic/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/basic/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,13 +1,13 @@
-## basic sub-directory
+## stdair/basic sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libbas.la
+noinst_LTLIBRARIES= libstdairbas.la
-libbas_la_SOURCES = $(bas_h_sources) $(bas_cc_sources)
-libbas_la_CXXFLAGS = $(BOOST_CFLAGS)
-libbas_la_LDFLAGS =
+libstdairbas_la_SOURCES = $(stdair_bas_h_sources) $(stdair_bas_cc_sources)
+libstdairbas_la_CXXFLAGS = $(BOOST_CFLAGS)
+libstdairbas_la_LDFLAGS =
# Header files
Modified: trunk/stdair/stdair/basic/sources.mk
===================================================================
--- trunk/stdair/stdair/basic/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/basic/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,4 +1,4 @@
-bas_h_sources = \
+stdair_bas_h_sources = \
$(top_srcdir)/stdair/basic/BasTypes.hpp \
$(top_srcdir)/stdair/basic/BasConst_General.hpp \
$(top_srcdir)/stdair/basic/BasConst_Request.hpp \
@@ -24,7 +24,7 @@
$(top_srcdir)/stdair/basic/RandomGeneration.hpp \
$(top_srcdir)/stdair/basic/RandomGenerationContext.hpp \
$(top_srcdir)/stdair/basic/DictionaryManager.hpp
-bas_cc_sources = \
+stdair_bas_cc_sources = \
$(top_srcdir)/stdair/basic/BasConst.cpp \
$(top_srcdir)/stdair/basic/BasChronometer.cpp \
$(top_srcdir)/stdair/basic/BasFileMgr.cpp \
Modified: trunk/stdair/stdair/batches/Makefile.am
===================================================================
--- trunk/stdair/stdair/batches/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/batches/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,4 +1,4 @@
-# batches
+# stdair/batches
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -10,9 +10,8 @@
# Binaries (batches)
bin_PROGRAMS = stdair
-stdair_SOURCES = $(batches_h_sources) $(batches_cc_sources)
+stdair_SOURCES = $(stdair_batches_h_sources) $(stdair_batches_cc_sources)
stdair_CXXFLAGS = $(BOOST_CFLAGS)
stdair_LDADD =
stdair_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/stdair/core/libstdair.la
Modified: trunk/stdair/stdair/batches/sources.mk
===================================================================
--- trunk/stdair/stdair/batches/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/batches/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,2 +1,3 @@
-batches_h_sources =
-batches_cc_sources = $(top_srcdir)/stdair/batches/stdair.cpp
+#
+stdair_batches_h_sources =
+stdair_batches_cc_sources = $(top_srcdir)/stdair/batches/stdair.cpp
Modified: trunk/stdair/stdair/bom/Makefile.am
===================================================================
--- trunk/stdair/stdair/bom/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/bom/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,12 +1,13 @@
-## bom sub-directory
+## stdair/bom sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES= libstdairbom.la
-libbom_la_SOURCES = $(bom_h_sources) $(bom_cc_sources)
-libbom_la_CXXFLAGS = $(BOOST_CFLAGS)
-libbom_la_LDFLAGS =
+libstdairbom_la_SOURCES = $(stdair_bom_h_sources) $(stdair_bom_cc_sources)
+libstdairbom_la_CXXFLAGS = $(BOOST_CFLAGS)
+libstdairbom_la_LDFLAGS =
# Header files
Modified: trunk/stdair/stdair/bom/sources.mk
===================================================================
--- trunk/stdair/stdair/bom/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/bom/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,4 +1,4 @@
-bom_h_sources = \
+stdair_bom_h_sources = \
$(top_srcdir)/stdair/bom/BomSource.hpp \
$(top_srcdir)/stdair/bom/BomTypes.hpp \
$(top_srcdir)/stdair/bom/BomStructure.hpp \
@@ -91,7 +91,7 @@
$(top_srcdir)/stdair/bom/AirlineStruct.hpp \
$(top_srcdir)/stdair/bom/EventStruct.hpp \
$(top_srcdir)/stdair/bom/EventQueue.hpp
-bom_cc_sources = \
+stdair_bom_cc_sources = \
$(top_srcdir)/stdair/bom/BomManager.cpp \
$(top_srcdir)/stdair/bom/BomRootKey.cpp \
$(top_srcdir)/stdair/bom/YieldStoreKey.cpp \
Modified: trunk/stdair/stdair/command/Makefile.am
===================================================================
--- trunk/stdair/stdair/command/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/command/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,14 +1,14 @@
-## command sub-directory
+## stdair/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES = libcmd.la
+noinst_LTLIBRARIES = libstdaircmd.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)
+libstdaircmd_la_SOURCES = $(stdair_cmd_h_sources) $(stdair_cmd_cc_sources)
+libstdaircmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
+libstdaircmd_la_LIBADD =
+libstdaircmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS)
# Header files
Modified: trunk/stdair/stdair/command/sources.mk
===================================================================
--- trunk/stdair/stdair/command/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/command/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,8 +1,8 @@
-cmd_h_sources = \
+stdair_cmd_h_sources = \
$(top_srcdir)/stdair/command/CmdAbstract.hpp \
$(top_srcdir)/stdair/command/CmdBomManager.hpp \
$(top_srcdir)/stdair/command/DBManagerForAirlines.hpp
-cmd_cc_sources = \
+stdair_cmd_cc_sources = \
$(top_srcdir)/stdair/command/CmdAbstract.cpp \
$(top_srcdir)/stdair/command/CmdBomManager.cpp \
$(top_srcdir)/stdair/command/DBManagerForAirlines.cpp
Modified: trunk/stdair/stdair/core/Makefile.am
===================================================================
--- trunk/stdair/stdair/core/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/core/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,4 +1,4 @@
-# core
+# stdair/core
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -14,12 +14,12 @@
libstdair_la_SOURCES = $(service_h_sources) $(service_cc_sources)
libstdair_la_LIBADD = \
- $(top_builddir)/stdair/basic/libbas.la \
- $(top_builddir)/stdair/bom/libbom.la \
- $(top_builddir)/stdair/dbadaptor/libdba.la \
- $(top_builddir)/stdair/factory/libfac.la \
- $(top_builddir)/stdair/command/libcmd.la \
- $(top_builddir)/stdair/service/libsvc.la
+ $(top_builddir)/stdair/basic/libstdairbas.la \
+ $(top_builddir)/stdair/bom/libstdairbom.la \
+ $(top_builddir)/stdair/dbadaptor/libstdairdba.la \
+ $(top_builddir)/stdair/factory/libstdairfac.la \
+ $(top_builddir)/stdair/command/libstdaircmd.la \
+ $(top_builddir)/stdair/service/libstdairsvc.la
libstdair_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_FILESYSTEM_LIB) $(SOCI_LIBS) \
Modified: trunk/stdair/stdair/dbadaptor/Makefile.am
===================================================================
--- trunk/stdair/stdair/dbadaptor/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/dbadaptor/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,14 +1,14 @@
-## dbadaptor sub-directory
+## stdair/dbadaptor sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libdba.la
+noinst_LTLIBRARIES= libstdairdba.la
-libdba_la_SOURCES= $(dba_h_sources) $(dba_cc_sources)
-libdba_la_CXXFLAGS = $(SOCI_CFLAGS)
-libdba_la_LIBADD =
-libdba_la_LDFLAGS = $(SOCI_LIBS)
+libstdairdba_la_SOURCES= $(stdair_dba_h_sources) $(stdair_dba_cc_sources)
+libstdairdba_la_CXXFLAGS = $(SOCI_CFLAGS)
+libstdairdba_la_LIBADD =
+libstdairdba_la_LDFLAGS = $(SOCI_LIBS)
# Header files
Modified: trunk/stdair/stdair/dbadaptor/sources.mk
===================================================================
--- trunk/stdair/stdair/dbadaptor/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/dbadaptor/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,6 +1,6 @@
-dba_h_sources = \
+stdair_dba_h_sources = \
$(top_srcdir)/stdair/dbadaptor/DbaAbstract.hpp \
$(top_srcdir)/stdair/dbadaptor/DbaAirline.hpp
-dba_cc_sources = \
+stdair_dba_cc_sources = \
$(top_srcdir)/stdair/dbadaptor/DbaAbstract.cpp \
$(top_srcdir)/stdair/dbadaptor/DbaAirline.cpp
Modified: trunk/stdair/stdair/factory/Makefile.am
===================================================================
--- trunk/stdair/stdair/factory/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/factory/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,11 +1,12 @@
-## factory sub-directory
+## stdair/factory sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES = libstdairfac.la
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
-libfac_la_CXXFLAGS =
+libstdairfac_la_SOURCES = $(stdair_fac_h_sources) $(stdair_fac_cc_sources)
+libstdairfac_la_CXXFLAGS =
# Header files
Modified: trunk/stdair/stdair/factory/sources.mk
===================================================================
--- trunk/stdair/stdair/factory/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/factory/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,8 +1,8 @@
-fac_h_sources = \
+stdair_fac_h_sources = \
$(top_srcdir)/stdair/factory/FacSupervisor.hpp \
$(top_srcdir)/stdair/factory/FacBomStructure.hpp \
$(top_srcdir)/stdair/factory/FacBomContent.hpp
-fac_cc_sources = \
+stdair_fac_cc_sources = \
$(top_srcdir)/stdair/factory/FacSupervisor.cpp \
$(top_srcdir)/stdair/factory/FacBomStructure.cpp \
$(top_srcdir)/stdair/factory/FacBomContent.cpp
Modified: trunk/stdair/stdair/service/Makefile.am
===================================================================
--- trunk/stdair/stdair/service/Makefile.am 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/service/Makefile.am 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,14 +1,15 @@
-## service sub-directory
+## stdair/service sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
#
-noinst_LTLIBRARIES= libsvc.la
+noinst_LTLIBRARIES= libstdairsvc.la
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources)
-libsvc_la_CXXFLAGS = $(SOCI_CFLAGS) $(MYSQL_CFLAGS)
-libsvc_la_LDFLAGS = $(SOCI_LIBS) $(MYSQL_LIBS)
+libstdairsvc_la_SOURCES = $(stdair_svc_h_sources) $(stdair_svc_cc_sources)
+libstdairsvc_la_CXXFLAGS = $(SOCI_CFLAGS) $(MYSQL_CFLAGS)
+libstdairsvc_la_LDFLAGS = $(SOCI_LIBS) $(MYSQL_LIBS)
+
# Header files
pkgincludedir = $(includedir)/stdair/service
pkginclude_HEADERS = $(svc_h_sources)
Modified: trunk/stdair/stdair/service/sources.mk
===================================================================
--- trunk/stdair/stdair/service/sources.mk 2010-07-13 14:13:48 UTC (rev 222)
+++ trunk/stdair/stdair/service/sources.mk 2010-07-20 22:51:33 UTC (rev 223)
@@ -1,7 +1,7 @@
-svc_h_sources = \
+stdair_svc_h_sources = \
$(top_srcdir)/stdair/service/Logger.hpp \
$(top_srcdir)/stdair/service/DBSessionManager.hpp
-svc_cc_sources = \
+stdair_svc_cc_sources = \
$(top_srcdir)/stdair/service/Logger.cpp \
$(top_srcdir)/stdair/service/DBSessionManager.cpp \
$(top_srcdir)/stdair/service/STDAIR_Service.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
