Changes in src/Makefile.am [5079a0:97ebf8]

File:

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

src/Makefile.am

@@ -1 +1 @@
 # PLEASE adhere to the alphabetical ordering in this Makefile!
 # Also indentation by a single tab
-
-SUBDIRS = Actions UIElements
 
 # this includes source files that need to be present at multiple points
@@ -51 +49 @@
   analysis_correlation.hpp
 
-ACTIONSSOURCE = \
-  Actions/Action.cpp \
+ACTIONSSOURCE = Actions/Action.cpp \
+  ${ANALYSISACTIONSOURCE} \
+  ${ATOMACTIONSOURCE} \
+  ${CMDACTIONSOURCE} \
+  ${FRAGMENTATIONACTIONSOURCE} \
+  ${MOLECULEACTIONSOURCE} \
+  ${PARSERACTIONSOURCE} \
+  ${TESSELATIONACTIONSOURCE} \
+  ${WORLDACTIONSOURCE} \
   Actions/ActionHistory.cpp \
   Actions/ActionRegistry.cpp \
@@ -59 +64 @@
   Actions/MakroAction.cpp \
   Actions/ManipulateAtomsProcess.cpp \
+  Actions/MapOfActions.cpp \
   Actions/MethodAction.cpp \
   Actions/Process.cpp
 
-ACTIONSHEADER = \
+ACTIONSHEADER = Actions/Action.hpp \
   ${ANALYSISACTIONHEADER} \
   ${ATOMACTIONHEADER} \
@@ -71 +77 @@
   ${TESSELATIONACTIONHEADER} \
   ${WORLDACTIONHEADER} \
-  Actions/Action.hpp \
   Actions/ActionHistory.hpp \
   Actions/ActionRegistry.hpp \
@@ -84 +89 @@
   Actions/Process.hpp
   
+ANALYSISACTIONSOURCE = \
+  Actions/AnalysisAction/MolecularVolumeAction.cpp \
+  Actions/AnalysisAction/PairCorrelationAction.cpp \
+  Actions/AnalysisAction/PairCorrelationToPointAction.cpp \
+  Actions/AnalysisAction/PairCorrelationToSurfaceAction.cpp \
+  Actions/AnalysisAction/PrincipalAxisSystemAction.cpp
+ANALYSISACTIONHEADER = \
+  Actions/AnalysisAction/MolecularVolumeAction.hpp \
+  Actions/AnalysisAction/PairCorrelationAction.hpp \
+  Actions/AnalysisAction/PairCorrelationToPointAction.hpp \
+  Actions/AnalysisAction/PairCorrelationToSurfaceAction.hpp \
+  Actions/AnalysisAction/PrincipalAxisSystemAction.hpp
+
+ATOMACTIONSOURCE = \
+  Actions/AtomAction/AddAction.cpp \
+  Actions/AtomAction/ChangeElementAction.cpp \
+  Actions/AtomAction/RemoveAction.cpp
+ATOMACTIONHEADER = \
+  Actions/AtomAction/AddAction.hpp \
+  Actions/AtomAction/ChangeElementAction.hpp \
+  Actions/AtomAction/RemoveAction.cpp
+
+CMDACTIONSOURCE = \
+  Actions/CmdAction/BondLengthTableAction.cpp \
+  Actions/CmdAction/ElementDbAction.cpp \
+  Actions/CmdAction/FastParsingAction.cpp \
+  Actions/CmdAction/HelpAction.cpp \
+  Actions/CmdAction/VerboseAction.cpp \
+  Actions/CmdAction/VersionAction.cpp
+CMDACTIONHEADER = \
+  Actions/CmdAction/BondLengthTableAction.hpp \
+  Actions/CmdAction/ElementDbAction.hpp \
+  Actions/CmdAction/FastParsingAction.hpp \
+  Actions/CmdAction/HelpAction.hpp \
+  Actions/CmdAction/VerboseAction.hpp \
+  Actions/CmdAction/VersionAction.hpp
+
+FRAGMENTATIONACTIONSOURCE = \
+  Actions/FragmentationAction/DepthFirstSearchAction.cpp \
+  Actions/FragmentationAction/FragmentationAction.cpp \
+  Actions/FragmentationAction/SubgraphDissectionAction.cpp               
+FRAGMENTATIONACTIONHEADER = \
+  Actions/FragmentationAction/DepthFirstSearchAction.hpp \
+  Actions/FragmentationAction/FragmentationAction.hpp \
+  Actions/FragmentationAction/SubgraphDissectionAction.hpp
+
+MOLECULEACTIONSOURCE = \
+  Actions/MoleculeAction/BondFileAction.cpp \
+  Actions/MoleculeAction/ChangeNameAction.cpp \
+  Actions/MoleculeAction/FillWithMoleculeAction.cpp \
+  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
+  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
+  Actions/MoleculeAction/SaveAdjacencyAction.cpp \
+  Actions/MoleculeAction/SaveBondsAction.cpp \
+  Actions/MoleculeAction/SaveTemperatureAction.cpp \
+  Actions/MoleculeAction/SuspendInWaterAction.cpp \
+  Actions/MoleculeAction/TranslateAction.cpp \
+  Actions/MoleculeAction/VerletIntegrationAction.cpp
+MOLECULEACTIONHEADER = \
+  Actions/MoleculeAction/BondFileAction.hpp \
+  Actions/MoleculeAction/ChangeNameAction.hpp \
+  Actions/MoleculeAction/FillWithMoleculeAction.hpp \
+  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
+  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
+  Actions/MoleculeAction/SaveAdjacencyAction.hpp \
+  Actions/MoleculeAction/SaveBondsAction.hpp \
+  Actions/MoleculeAction/SaveTemperatureAction.hpp \
+  Actions/MoleculeAction/SuspendInWaterAction.hpp \
+  Actions/MoleculeAction/TranslateAction.hpp \
+  Actions/MoleculeAction/VerletIntegrationAction.hpp
+                 
+PARSERACTIONSOURCE = \
+  Actions/ParserAction/LoadXyzAction.cpp \
+  Actions/ParserAction/SaveXyzAction.cpp       
+PARSERACTIONHEADER = \
+  Actions/ParserAction/LoadXyzAction.hpp \
+  Actions/ParserAction/SaveXyzAction.hpp
+
+TESSELATIONACTIONSOURCE = \
+  Actions/TesselationAction/ConvexEnvelopeAction.cpp \
+  Actions/TesselationAction/NonConvexEnvelopeAction.cpp               
+TESSELATIONACTIONHEADER = \
+  Actions/TesselationAction/ConvexEnvelopeAction.hpp \
+  Actions/TesselationAction/NonConvexEnvelopeAction.hpp
+
+WORLDACTIONSOURCE = \
+  Actions/WorldAction/AddEmptyBoundaryAction.cpp \
+  Actions/WorldAction/BoundInBoxAction.cpp \
+  Actions/WorldAction/CenterInBoxAction.cpp \
+  Actions/WorldAction/CenterOnEdgeAction.cpp \
+  Actions/WorldAction/ChangeBoxAction.cpp \
+  Actions/WorldAction/RemoveSphereOfAtomsAction.cpp \
+  Actions/WorldAction/RepeatBoxAction.cpp \
+  Actions/WorldAction/ScaleBoxAction.cpp \
+  Actions/WorldAction/SetDefaultNameAction.cpp \
+  Actions/WorldAction/SetGaussianBasisAction.cpp               
+WORLDACTIONHEADER = \
+  Actions/WorldAction/AddEmptyBoundaryAction.hpp \
+  Actions/WorldAction/BoundInBoxAction.hpp \
+  Actions/WorldAction/CenterInBoxAction.hpp \
+  Actions/WorldAction/CenterOnEdgeAction.hpp \
+  Actions/WorldAction/ChangeBoxAction.hpp \
+  Actions/WorldAction/RemoveSphereOfAtomsAction.hpp \
+  Actions/WorldAction/RepeatBoxAction.hpp \
+  Actions/WorldAction/ScaleBoxAction.hpp \
+  Actions/WorldAction/SetDefaultNameAction.hpp \
+  Actions/WorldAction/SetGaussianBasisAction.hpp
+
+
 
 PARSERSOURCE = \
@@ -102 +216 @@
   Patterns/Observer.hpp \
   Patterns/Singleton.hpp
+
+# Below is all for the User Interface
+
+VIEWSOURCE = \
+  Views/View.cpp \
+  Views/StringView.cpp \
+  Views/MethodStringView.cpp \
+  Views/StreamStringView.cpp
+VIEWHEADER = \
+  Views/View.hpp \
+  Views/StringView.hpp \
+  Views/MethodStringView.hpp \
+  Views/StreamStringView.hpp
+
+MENUSOURCE = \
+  Menu/Menu.cpp \
+  Menu/TextMenu.cpp \
+  Menu/MenuItem.cpp \
+  Menu/SubMenuItem.cpp \
+  Menu/ActionMenuItem.cpp \
+  Menu/SeperatorItem.cpp \
+  Menu/DisplayMenuItem.cpp
+  
+MENUHEADER = \
+  Menu/Menu.hpp \
+  Menu/TextMenu.hpp \
+  Menu/MenuItem.hpp \
+  Menu/SubMenuItem.hpp \
+  Menu/ActionMenuItem.hpp \
+  Menu/SeperatorItem.hpp \
+  Menu/DisplayMenuItem.hpp
+
+UISOURCE = \
+  ${ACTIONSSOURCE} \
+  ${COMMANDLINEUISOURCE} \
+  ${MENUSOURCE} \
+  ${TEXTUISOURCE} \
+  ${VIEWSOURCE} \
+  UIElements/Dialog.cpp \
+  UIElements/MainWindow.cpp \
+  UIElements/UIFactory.cpp
+  
+UIHEADER = \
+  ${ACTIONSHEADER} \
+  ${COMMANDLINEUIHEADER} \
+  ${MENUHEADER} \
+  ${TEXTUIHEADER} \
+  ${VIEWHEADER} \
+  UIElements/Dialog.hpp \
+  UIElements/MainWindow.hpp \
+  UIElements/UIFactory.hpp
+
+TEXTUISOURCE = \
+  UIElements/TextDialog.cpp \
+  UIElements/TextStatusIndicator.cpp \
+  UIElements/TextUIFactory.cpp \
+  UIElements/TextWindow.cpp
+TEXTUIHEADER = \
+  UIElements/TextDialog.hpp \
+  UIElements/TextStatusIndicator.hpp \
+  UIElements/TextUIFactory.hpp \
+  UIElements/TextWindow.hpp
+
+COMMANDLINEUISOURCE = \
+  UIElements/CommandLineDialog.cpp \
+  UIElements/CommandLineStatusIndicator.cpp \
+  UIElements/CommandLineUIFactory.cpp \
+  UIElements/CommandLineWindow.cpp
+COMMANDLINEUIHEADER = \
+  UIElements/CommandLineDialog.hpp \
+  UIElements/CommandLineStatusIndicator.hpp \
+  UIElements/CommandLineUIFactory.hpp \
+  UIElements/CommandLineWindow.hpp
 
 # all these files are only used for legacy reasons while the transition is in progress
@@ -134 +321 @@
 SOURCE = \
   ${ANALYSISSOURCE} \
-  ${ACTIONSSOURCE} \
   ${ATOMSOURCE} \
   ${PATTERNSOURCE} \
   ${PARSERSOURCE} \
+  ${UISOURCE} \
   ${DESCRIPTORSOURCE} \
   ${HELPERSOURCE} \
@@ -148 +335 @@
   config.cpp \
   element.cpp \
-  elements_db.cpp \
   ellipsoid.cpp \
   errorlogger.cpp \
@@ -180 +366 @@
 HEADER = \
   ${ANALYSISHEADER} \
-  ${ACTIONSHEADER} \
   ${ATOMHEADER} \
   ${PARSERHEADER} \
   ${PATTERNHEADER} \
+  ${UIHEADER} \
   ${DESCRIPTORHEADER} \
   ${EXCEPTIONHEADER} \
@@ -194 +380 @@
   defs.hpp \
   element.hpp \
-  elements_db.hpp \
   ellipsoid.hpp \
   errorlogger.hpp \
@@ -222 +407 @@
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
-INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
+INCLUDES = -I$(top_srcdir)/src/unittests
 
 noinst_LIBRARIES = libmolecuilder.a libgslwrapper.a
@@ -229 +414 @@
 libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
 libgslwrapper_a_SOURCES = ${LINALGSOURCE} ${LINALGHEADER}
+molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
 molecuilder_LDFLAGS = $(BOOST_LDFLAGS)
 molecuilder_SOURCES = builder.cpp
-molecuilder_LDADD =  UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilder.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB} 
+molecuilder_LDADD = libmolecuilder.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
 joiner_LDADD = libmolecuilder.a $(BOOST_LIB) ${BOOST_THREAD_LIB}