Changes in src/Makefile.am [785218:004d5c]

File:

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

src/Makefile.am

@@ -8 +8 @@
 BUILT_SOURCES =
 bin_PROGRAMS =
+EXTRA_DIST =
 
 include Actions/Makefile.am
@@ -17 +18 @@
 include Graph/Makefile.am
 include Helpers/Makefile.am
+
+if CONDJOBMARKET
+include Jobs/Makefile.am
+endif
+
 include LinkedCell/Makefile.am
-include Parameters/Makefile.am
 include Parser/Makefile.am
 include RandomNumbers/Makefile.am
@@ -24 +29 @@
 include UIElements/Makefile.am
 
-AM_LDFLAGS = -ldl ${BOOST_LDFLAGS}
+AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
@@ -247 +252 @@
 
 
-INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements -I$(top_srcdir)/LinearAlgebra/src
+INCLUDES = \
+        -I$(top_srcdir)/src/unittests \
+        -I$(top_srcdir)/src/Actions \
+        -I$(top_srcdir)/src/UIElements \
+        -I$(top_srcdir)/LinearAlgebra/src
 
 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 
 noinst_LIBRARIES = libmenu.a
-bin_PROGRAMS += molecuilder joiner analyzer
+bin_PROGRAMS += molecuilder joiner analyzer 
 EXTRA_PROGRAMS = unity
 
@@ -278 +287 @@
         Actions/pyMoleCuilder.cpp
 pyMoleCuilder_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} -I$(PYTHON_INCLUDE_DIR)
-pyMoleCuilder_la_LDFLAGS = -module -avoid-version -shared $(BOOST_PYTHON_LDFLAGS) 
+pyMoleCuilder_la_LDFLAGS = -module -avoid-version -shared
 pyMoleCuilder_la_LIBADD = \
         libMolecuilderUI.la \
-        $(BOOST_PYTHON_LIBS) \
+        $(BOOST_PYTHON_LDFLAGS) $(BOOST_PYTHON_LIBS) \
         ${CodePatterns_LIBS} \
         -l$(PYTHON_LIB)
@@ -287 +296 @@
 
 
-molecuilder_CXXFLAGS = $(AM_CPPFLAGS) 
+molecuilder_CPPFLAGS = $(AM_CPPFLAGS)
 #molecuilder_CXXFLAGS += -DNO_CACHING
 molecuilder_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
@@ -352 +361 @@
         $(BOOST_THREAD_LIBS)
 
+if CONDJOBMARKET
+CONTROLLERSOURCE = \
+        controller_MPQCCommandJob.cpp \
+        ControllerOptions_MPQCCommandJob.cpp
+
+CONTROLLERHEADER = \
+        controller_MPQCCommandJob.hpp \
+        ControllerOptions_MPQCCommandJob.hpp
+
+
+noinst_LTLIBRARIES += libFragmentationAutomationController.la
+libFragmentationAutomationController_la_includedir = $(includedir)/MoleCuilder/JobMarket
+nobase_libFragmentationAutomationController_la_include_HEADERS = $(CONTROLLERHEADER)
+libFragmentationAutomationController_la_SOURCES = $(CONTROLLERSOURCE)
+ libFragmentationAutomationController_la_CPPFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
+libFragmentationAutomationController_la_LIBADD = \
+        ${JobMarket_Controller_LIBS} \
+        $(JobMarket_LIBS)
+
+bin_PROGRAMS += Controller PoolWorker Server
+
+Controller_SOURCES = controller.cpp controller_AddOn_MPQCCommandJob.cpp
+Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) ${CodePatterns_LDFLAGS}
+Controller_CXXFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
+Controller_LDADD = \
+        libFragmentationAutomationController.la \
+        libMolecuilderJobs.la \
+        libMolecuilderFragmentation.la \
+        libMolecuilderHelpers.la \
+        $(JobMarket_Controller_LIBS) \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        ${CodePatterns_LIBS}
+
+PoolWorker_SOURCES = poolworker.cpp 
+PoolWorker_LDFLAGS = $(AM_LDFLAGS) ${CodePatterns_LDFLAGS}
+PoolWorker_CXXFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
+PoolWorker_LDADD = \
+        libMolecuilderJobs.la \
+        ${JobMarket_PoolWorker_LIBS} \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
+
+Server_SOURCES = Server.cpp 
+Server_LDFLAGS = $(AM_LDFLAGS) ${CodePatterns_LDFLAGS}
+Server_CXXFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
+Server_LDADD = \
+        libMolecuilderJobs.la \
+        ${JobMarket_Server_LIBS} \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
+endif
+
 unity_SOURCES = unity.cpp
 unity_CXXFLAGS = $(AM_CPPFLAGS) 
@@ -374 +436 @@
         fi
 
-EXTRA_DIST = \
+EXTRA_DIST += \
         $(srcdir)/.git-version \
         $(bondtable_DATA) \