[Stdair-svn] SF.net SVN: stdair:[312] trunk/stdair

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

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

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

Modified Paths:
--------------
    trunk/stdair/Makefile.am
    trunk/stdair/batches/Makefile.am
    trunk/stdair/batches/sources.mk
    trunk/stdair/configure.ac
    trunk/stdair/doc/Makefile.am
    trunk/stdair/stdair/Makefile.am
    trunk/stdair/test/architecture/Makefile.am
    trunk/stdair/test/stdair/Makefile.am

Added Paths:
-----------
    trunk/stdair/batches/
    trunk/stdair/stdair/sources.mk

Removed Paths:
-------------
    trunk/stdair/stdair/batches/
    trunk/stdair/stdair/core/

Modified: trunk/stdair/Makefile.am
===================================================================
--- trunk/stdair/Makefile.am	2010-09-06 13:52:53 UTC (rev 311)
+++ trunk/stdair/Makefile.am	2010-09-06 15:17:48 UTC (rev 312)
@@ -30,7 +30,7 @@
 EXTRA_DIST =
 
 # Build in these directories:
-SUBDIRS = stdair man $(HTML_DOC_DIR) $(TEST_DIR)
+SUBDIRS = stdair batches man $(HTML_DOC_DIR) $(TEST_DIR)
 
 
 # Configuration helpers

Modified: trunk/stdair/batches/Makefile.am
===================================================================
--- trunk/stdair/stdair/batches/Makefile.am	2010-09-06 12:38:03 UTC (rev 307)
+++ trunk/stdair/batches/Makefile.am	2010-09-06 15:17:48 UTC (rev 312)
@@ -14,4 +14,4 @@
 stdair_CXXFLAGS = $(BOOST_CFLAGS)
 stdair_LDADD = 
 stdair_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la
+	$(top_builddir)/stdair/libstdair.la

Modified: trunk/stdair/batches/sources.mk
===================================================================
--- trunk/stdair/stdair/batches/sources.mk	2010-09-06 12:38:03 UTC (rev 307)
+++ trunk/stdair/batches/sources.mk	2010-09-06 15:17:48 UTC (rev 312)
@@ -1,3 +1,3 @@
 #
 stdair_batches_h_sources =
-stdair_batches_cc_sources = $(top_srcdir)/stdair/batches/stdair.cpp
+stdair_batches_cc_sources = $(top_srcdir)/batches/stdair.cpp

Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac	2010-09-06 13:52:53 UTC (rev 311)
+++ trunk/stdair/configure.ac	2010-09-06 15:17:48 UTC (rev 312)
@@ -211,8 +211,7 @@
 	stdair/command/Makefile
 	stdair/config/Makefile
 	stdair/service/Makefile
-	stdair/core/Makefile
-	stdair/batches/Makefile
+	batches/Makefile
 	man/Makefile
 	doc/Makefile
 	doc/images/Makefile

Modified: trunk/stdair/doc/Makefile.am
===================================================================
--- trunk/stdair/doc/Makefile.am	2010-09-06 13:52:53 UTC (rev 311)
+++ trunk/stdair/doc/Makefile.am	2010-09-06 15:17:48 UTC (rev 312)
@@ -8,7 +8,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
 
 SUBDIRS = images tutorial local
 

Modified: trunk/stdair/stdair/Makefile.am
===================================================================
--- trunk/stdair/stdair/Makefile.am	2010-09-06 13:52:53 UTC (rev 311)
+++ trunk/stdair/stdair/Makefile.am	2010-09-06 15:17:48 UTC (rev 312)
@@ -1,18 +1,33 @@
 # stdair
 include $(top_srcdir)/Makefile.common
-include $(srcdir)/core/sources.mk
+include $(srcdir)/sources.mk
 
 ## Source directory
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = basic bom dbadaptor factory command config service core batches
+SUBDIRS = basic bom dbadaptor factory command config service
 
 #EXTRA_DIST = config_msvc.h
 EXTRA_DIST =
 
+# Library
+lib_LTLIBRARIES = libstdair.la
 
+libstdair_la_SOURCES = $(stdair_service_h_sources) $(stdair_service_cc_sources)
+libstdair_la_LIBADD = \
+			$(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) \
+	-version-info $(GENERIC_LIBRARY_VERSION)
+
 # Header files
-#nobase_pkginclude_HEADERS = $(service_h_sources)
-#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
+pkgincludedir = $(includedir)/stdair
+pkginclude_HEADERS = $(stdair_service_h_sources)
 

Copied: trunk/stdair/stdair/sources.mk (from rev 307, trunk/stdair/stdair/core/sources.mk)
===================================================================
--- trunk/stdair/stdair/sources.mk	                        (rev 0)
+++ trunk/stdair/stdair/sources.mk	2010-09-06 15:17:48 UTC (rev 312)
@@ -0,0 +1,4 @@
+stdair_service_h_sources = $(top_srcdir)/stdair/STDAIR_Types.hpp \
+					$(top_srcdir)/stdair/STDAIR_Service.hpp
+stdair_service_cc_sources =
+

Modified: trunk/stdair/test/architecture/Makefile.am
===================================================================
--- trunk/stdair/test/architecture/Makefile.am	2010-09-06 13:52:53 UTC (rev 311)
+++ trunk/stdair/test/architecture/Makefile.am	2010-09-06 15:17:48 UTC (rev 312)
@@ -12,6 +12,6 @@
 architecture_CXXFLAGS = $(BOOST_CFLAGS)
 architecture_LDADD = $(BOOST_LIB)
 architecture_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) \
-	$(top_builddir)/stdair/core/libstdair.la
+	$(top_builddir)/stdair/libstdair.la
 
 EXTRA_DIST =

Modified: trunk/stdair/test/stdair/Makefile.am
===================================================================
--- trunk/stdair/test/stdair/Makefile.am	2010-09-06 13:52:53 UTC (rev 311)
+++ trunk/stdair/test/stdair/Makefile.am	2010-09-06 15:17:48 UTC (rev 312)
@@ -19,7 +19,7 @@
 	$(stdair_test_lib_cc_sources)
 libstdairtest_la_CXXFLAGS =
 libstdairtest_la_LDFLAGS = \
-	$(top_builddir)/stdair/core/libstdair.la
+	$(top_builddir)/stdair/libstdair.la
 
 
 ##
@@ -36,4 +36,4 @@
 StandardAirlineITTestSuite_LDADD = 
 StandardAirlineITTestSuite_LDFLAGS = $(BOOST_LIBS) $(CPPUNIT_LIBS) $(EXTRACC_LIBS)\
 	$(top_builddir)/test/stdair/libstdairtest.la \
-	$(top_builddir)/stdair/core/libstdair.la
+	$(top_builddir)/stdair/libstdair.la


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