Changes in src/Makefile.am [1a48d2:748fc7]

File:

• src/Makefile.am (modified) (9 diffs)

src/Makefile.am

@@ -10 +10 @@
 EXTRA_DIST =
 
-include Actions/Makefile.am
-include Analysis/Makefile.am
-include Atom/Makefile.am
-include Element/Makefile.am
-include Filling/Makefile.am
-include Fragmentation/Makefile.am
-include Fragmentation/Automation/Makefile.am
-include Fragmentation/Summation/Containers/Makefile.am
-include Fragmentation/Summation/Converter/Makefile.am
-include Fragmentation/Summation/Makefile.am
-include Fragmentation/Summation/SetValues/Makefile.am
-include FunctionApproximation/Makefile.am
-include Graph/Makefile.am
+# libMolecuilder.la requires the libraries listed below
+
 include Helpers/Makefile.am
-include Jobs/Makefile.am
-
-if CONDPYTHON
-include Python/Makefile.am
-endif
-
-include LinkedCell/Makefile.am
-include Parameters/Makefile.am
-include Parser/Makefile.am
-include Potentials/Makefile.am
-include RandomNumbers/Makefile.am
 include Shapes/Makefile.am
 include Tesselation/Makefile.am
-include UIElements/Makefile.am
+
+# then comes the library itself
 
 AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
-AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+AM_CPPFLAGS = \
+        -I$(top_srcdir)/src/unittests \
+        -I$(top_srcdir)/src/Actions \
+        -I$(top_srcdir)/src/UIElements \
+        -I$(top_srcdir)/LinearAlgebra/src \
+        ${BOOST_CPPFLAGS} \
+        ${CodePatterns_CFLAGS}
+
 
 BONDSOURCE = \
@@ -195 +181 @@
   WorldTime.hpp
 
-noinst_LTLIBRARIES += libMolecuilder.la
+lib_LTLIBRARIES += libMolecuilder.la
 libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
 libMolecuilder_la_LDFLAGS = \
@@ -205 +191 @@
         libMolecuilderTesselation.la \
         libMolecuilderShapes.la \
+        libMolecuilderHelpers.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
@@ -228 +215 @@
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-#libMolecuilder_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilder_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -251 +238 @@
 pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
 
-
-INCLUDES = \
-        -I$(top_srcdir)/src/unittests \
-        -I$(top_srcdir)/src/Actions \
-        -I$(top_srcdir)/src/UIElements \
-        -I$(top_srcdir)/LinearAlgebra/src
+# then we compile the remainder of all other libraries, especially
+# libMolecuilderUI.la, which requires libMolecuilder.la on install
+
+include Actions/Makefile.am
+include Analysis/Makefile.am
+include Atom/Makefile.am
+include Element/Makefile.am
+include Filling/Makefile.am
+include Fragmentation/Makefile.am
+include Fragmentation/Automation/Makefile.am
+include Fragmentation/Summation/Containers/Makefile.am
+include Fragmentation/Summation/Converter/Makefile.am
+include Fragmentation/Summation/Makefile.am
+include Fragmentation/Summation/SetValues/Makefile.am
+include FunctionApproximation/Makefile.am
+include Graph/Makefile.am
+include Jobs/Makefile.am
+
+if CONDPYTHON
+include Python/Makefile.am
+endif
+
+include LinkedCell/Makefile.am
+include Parameters/Makefile.am
+include Parser/Makefile.am
+include Potentials/Makefile.am
+include RandomNumbers/Makefile.am
+include UIElements/Makefile.am
 
 bin_PROGRAMS += molecuilder 
@@ -283 +292 @@
         Actions/GlobalListOfActions.hpp \
         Actions/ActionHistory.hpp
-pyMoleCuilder_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) -I$(PYTHON_INCLUDE_DIR)
+pyMoleCuilder_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) -I$(PYTHON_INCLUDE_DIR)
 pyMoleCuilder_la_LDFLAGS = -module -avoid-version -shared $(BOOST_PYTHON_LDFLAGS) 
 pyMoleCuilder_la_LIBADD = \
@@ -299 +308 @@
 molecuilder_LDFLAGS = \
         $(AM_LDFLAGS) \
+        $(CodePatterns_LDFLAGS) \
         $(BOOST_FILESYSTEM_LDFLAGS) \
         $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
@@ -307 +317 @@
         builder.cpp \
         builder_init.cpp \
-        builder_init.hpp
+        builder_init.hpp \
+        Python/PythonScripting.hpp
 molecuilder_LDADD = \
+        libMolecuilder.la \
         libMolecuilderUI.la
 molecuilder_LDADD += \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_THREAD_LIBS) \
@@ -347 +358 @@
         $(BOOST_THREAD_LDFLAGS)
 molecuildergui_LDADD = \
+        libMolecuilder.la \
         libMolecuilderQtUI.la \
         libMolecuilderUI.la
 molecuildergui_LDADD += \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_THREAD_LIBS) \