Changes in src/Makefile.am [8df74d:9ee38b]

File:

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

src/Makefile.am

@@ -59 +59 @@
   Actions/Process.hpp
 
-
 PATTERNSOURCE = \
   Patterns/Observer.cpp
@@ -101 +100 @@
   Descriptors/MoleculePtrDescriptor.hpp \
   Descriptors/MoleculeSelectionDescriptor.cpp
-  
-THERMOSTATSOURCE = \
-  Thermostats/Berendsen.cpp \
-  Thermostats/GaussianThermostat.cpp \
-  Thermostats/Langevin.cpp \
-  Thermostats/NoseHoover.cpp \
-  Thermostats/NoThermostat.cpp \
-  Thermostats/Thermostat.cpp \
-  Thermostats/Woodcock.cpp
-
-THERMOSTATHEADER = \
-  Thermostats/Berendsen.hpp \
-  Thermostats/GaussianThermostat.hpp \
-  Thermostats/Langevin.hpp \
-  Thermostats/NoseHoover.hpp \
-  Thermostats/NoThermostat.hpp \
-  Thermostats/Thermostat.hpp \
-  Thermostats/Woodcock.hpp
-
-QTUIMOC_HEADER = UIElements/Qt4/QtDialog.hpp \
-        UIElements/Qt4/QtMainWindow.hpp \
-        UIElements/Menu/Qt4/QtMenu.hpp \
-        UIElements/Views/Qt4/QtWorldView.hpp \
-        UIElements/Views/Qt4/GLMoleculeView.hpp \
-        UIElements/Views/Qt4/QtMoleculeView.hpp \
-        UIElements/Views/Qt4/QtStatusBar.hpp
+
+
+QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
+        UIElements/QT4/QTMainWindow.hpp \
+        UIElements/Menu/QT4/QTMenu.hpp \
+        UIElements/Views/QT4/QTWorldView.hpp \
+        UIElements/Views/QT4/GLMoleculeView.hpp \
+        UIElements/Views/QT4/QTMoleculeView.hpp \
+        UIElements/Views/QT4/QTStatusBar.hpp
                                   
 QTUISOURCE = allmocs.moc.cpp \
-  UIElements/Qt4/Pipe/AtomQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/AtomsQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/BooleanQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/BoxQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/DoubleQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/ElementsQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/EmptyQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/ElementQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/FileQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/IntQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/MoleculeQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/MoleculesQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/StringQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/VectorQtQueryPipe.cpp \
-  UIElements/Qt4/Pipe/VectorsQtQueryPipe.cpp \
-  UIElements/Qt4/Query/AtomQtQuery.cpp \
-  UIElements/Qt4/Query/AtomsQtQuery.cpp \
-  UIElements/Qt4/Query/BooleanQtQuery.cpp \
-  UIElements/Qt4/Query/BoxQtQuery.cpp \
-  UIElements/Qt4/Query/DoubleQtQuery.cpp \
-  UIElements/Qt4/Query/DoublesQtQuery.cpp \
-  UIElements/Qt4/Query/ElementQtQuery.cpp \
-  UIElements/Qt4/Query/ElementsQtQuery.cpp \
-  UIElements/Qt4/Query/EmptyQtQuery.cpp \
-  UIElements/Qt4/Query/FileQtQuery.cpp \
-  UIElements/Qt4/Query/IntQtQuery.cpp \
-  UIElements/Qt4/Query/IntsQtQuery.cpp \
-  UIElements/Qt4/Query/MoleculeQtQuery.cpp \
-  UIElements/Qt4/Query/MoleculesQtQuery.cpp \
-  UIElements/Qt4/Query/StringQtQuery.cpp \
-  UIElements/Qt4/Query/StringsQtQuery.cpp \
-  UIElements/Qt4/Query/VectorQtQuery.cpp \
-  UIElements/Qt4/Query/VectorsQtQuery.cpp \
-        UIElements/Qt4/QtMainWindow.cpp \
-        UIElements/Qt4/QtDialog.cpp \
-        UIElements/Qt4/QtUIFactory.cpp \
-        UIElements/Menu/Qt4/QtMenu.cpp \
-        UIElements/Views/Qt4/QtWorldView.cpp \
-        UIElements/Views/Qt4/GLMoleculeView.cpp \
-        UIElements/Views/Qt4/QtMoleculeView.cpp \
-        UIElements/Views/Qt4/QtStatusBar.cpp
+        UIElements/QT4/QTMainWindow.cpp \
+        UIElements/QT4/QTDialog.cpp \
+        UIElements/QT4/QTUIFactory.cpp \
+        UIElements/Menu/QT4/QTMenu.cpp \
+        UIElements/Views/QT4/QTWorldView.cpp \
+        UIElements/Views/QT4/GLMoleculeView.cpp \
+        UIElements/Views/QT4/QTMoleculeView.cpp \
+        UIElements/Views/QT4/QTStatusBar.cpp
              
-QTUIHEADER = \
-  ${QTUIMOC_HEADER} \
-  UIElements/Qt4/Pipe/QtQueryListPipe.hpp \
-  UIElements/Qt4/QtUIFactory.hpp
+QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
 
 QTUI_DEFS =
@@ -207 +153 @@
   ${SHAPESOURCE} \
   ${DESCRIPTORSOURCE} \
-  ${THERMOSTATSOURCE} \
   ${TESSELATIONSOURCE} \
   bond.cpp \
@@ -245 +190 @@
   ${SHAPEHEADER} \
   ${DESCRIPTORHEADER} \
-  ${THERMOSTATHEADER} \
   ${TESSELATIONHEADER} \
   bond.hpp \
@@ -264 +208 @@
   lists.hpp \
   molecule.hpp \
+  molecule_template.hpp \
   parser.hpp \
   periodentafel.hpp \
@@ -325 +270 @@
 
 
-BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
+BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
 GUI_LIBS = ${QT_LDADD} ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS}
 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
@@ -351 +296 @@
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB)
-
-#Stuff for building the GUI using Qt
+        $(BOOST_LIB) \
+        ${BOOST_THREAD_LIB} \
+        ${BOOST_PROGRAM_OPTIONS_LIB}
+
+
+#Stuff for building the GUI using QT
 molecuildergui_SOURCES = ${QTUISOURCE} builder.cpp
 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
@@ -359 +307 @@
 
 unity_SOURCES = unity.cpp
-unity_LDADD = $(BOOST_LIB)
+unity_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 
 molecuildergui_LDADD = \
@@ -370 +318 @@
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
         $(BOOST_LIB) \
+        ${BOOST_THREAD_LIB} \
+        ${BOOST_PROGRAM_OPTIONS_LIB} \
         ${GUI_LIBS}
 
@@ -381 +331 @@
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB)
+        $(BOOST_LIB) \
+        ${BOOST_THREAD_LIB} \
+        ${BOOST_PROGRAM_OPTIONS_LIB}
 
 analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp 
@@ -392 +344 @@
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB)
-
-#Rules needed for Qt4
+        $(BOOST_LIB) \
+        ${BOOST_THREAD_LIB} \
+        ${BOOST_PROGRAM_OPTIONS_LIB}
+
+#Rules needed for QT4
 # UI-Files are scattered throughout several subdirectories
 # Therfore `%'-rules do not seem to work