Changes in src/Actions/Makefile.am [125002:ca03c7]

File:

• src/Actions/Makefile.am (modified) (3 diffs)

src/Actions/Makefile.am

@@ -15 +15 @@
   ${MOLECULEACTIONSOURCE} \
   ${PARSERACTIONSOURCE} \
-  ${SELECTIONATOMACTIONSOURCE} \
-  ${SELECTIONMOLECULEACTIONSOURCE} \
+  ${SELECTIONACTIONSOURCE} \
   ${TESSELATIONACTIONSOURCE} \
   ${WORLDACTIONSOURCE} \
@@ -30 +29 @@
   ${MOLECULEACTIONHEADER} \
   ${PARSERACTIONHEADER} \
-  ${SELECTIONATOMACTIONHEADER} \
-  ${SELECTIONMOLECULEACTIONHEADER} \
+  ${SELECTIONACTIONHEADER} \
   ${TESSELATIONACTIONHEADER} \
   ${WORLDACTIONHEADER} \
@@ -124 +122 @@
   MoleculeAction/VerletIntegrationAction.hpp
                  
-SELECTIONATOMACTIONSOURCE = \
-        SelectionAction/Atoms/AllAtomsAction.cpp \
-        SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp \
-        SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp \
-        SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp \
-        SelectionAction/Atoms/AtomByElementAction.cpp \
-        SelectionAction/Atoms/AtomByIdAction.cpp \
-        SelectionAction/Atoms/ClearAllAtomsAction.cpp \
-        SelectionAction/Atoms/NotAllAtomsAction.cpp \
-        SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp \
-        SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp \
-        SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp \
-        SelectionAction/Atoms/NotAtomByElementAction.cpp \
-        SelectionAction/Atoms/NotAtomByIdAction.cpp
-SELECTIONATOMACTIONHEADER = \
-        SelectionAction/Atoms/AllAtomsAction.hpp \
-        SelectionAction/Atoms/AllAtomsInsideCuboidAction.hpp \
-        SelectionAction/Atoms/AllAtomsInsideSphereAction.hpp \
-        SelectionAction/Atoms/AllAtomsOfMoleculeAction.hpp \
-        SelectionAction/Atoms/AtomByElementAction.hpp \
-        SelectionAction/Atoms/AtomByIdAction.hpp \
-        SelectionAction/Atoms/ClearAllAtomsAction.hpp \
-        SelectionAction/Atoms/NotAllAtomsAction.hpp \
-        SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.hpp \
-        SelectionAction/Atoms/NotAllAtomsInsideSphereAction.hpp \
-        SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.hpp \
-        SelectionAction/Atoms/NotAtomByElementAction.hpp \
-        SelectionAction/Atoms/NotAtomByIdAction.hpp
-
-SELECTIONMOLECULEACTIONSOURCE = \
-        SelectionAction/Molecules/AllMoleculesAction.cpp \
-        SelectionAction/Molecules/ClearAllMoleculesAction.cpp \
-        SelectionAction/Molecules/MoleculeByFormulaAction.cpp \
-        SelectionAction/Molecules/MoleculeByIdAction.cpp \
-        SelectionAction/Molecules/MoleculeByNameAction.cpp \
-        SelectionAction/Molecules/MoleculeByOrderAction.cpp \
-        SelectionAction/Molecules/MoleculeOfAtomAction.cpp \
-        SelectionAction/Molecules/NotAllMoleculesAction.cpp \
-        SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp \
-        SelectionAction/Molecules/NotMoleculeByIdAction.cpp \
-        SelectionAction/Molecules/NotMoleculeByNameAction.cpp \
-        SelectionAction/Molecules/NotMoleculeByOrderAction.cpp \
-        SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp
-SELECTIONMOLECULEACTIONHEADER = \
-        SelectionAction/Molecules/AllMoleculesAction.hpp \
-        SelectionAction/Molecules/ClearAllMoleculesAction.hpp \
-        SelectionAction/Molecules/MoleculeByFormulaAction.hpp \
-        SelectionAction/Molecules/MoleculeByIdAction.hpp \
-        SelectionAction/Molecules/MoleculeByNameAction.hpp \
-        SelectionAction/Molecules/MoleculeByOrderAction.hpp \
-        SelectionAction/Molecules/MoleculeOfAtomAction.hpp \
-        SelectionAction/Molecules/NotAllMoleculesAction.hpp \
-        SelectionAction/Molecules/NotMoleculeByFormulaAction.hpp \
-        SelectionAction/Molecules/NotMoleculeByIdAction.hpp \
-        SelectionAction/Molecules/NotMoleculeByNameAction.hpp \
-        SelectionAction/Molecules/NotMoleculeByOrderAction.hpp \
-        SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp
-        
+SELECTIONACTIONSOURCE = \
+        SelectionAction/AllAtomsAction.cpp \
+        SelectionAction/AllAtomsInsideCuboidAction.cpp \
+        SelectionAction/AllAtomsInsideSphereAction.cpp \
+        SelectionAction/AllAtomsOfMoleculeAction.cpp \
+        SelectionAction/AllMoleculesAction.cpp \
+        SelectionAction/AtomByElementAction.cpp \
+        SelectionAction/AtomByIdAction.cpp \
+        SelectionAction/ClearAllAtomsAction.cpp \
+        SelectionAction/ClearAllMoleculesAction.cpp \
+        SelectionAction/MoleculeByFormulaAction.cpp \
+        SelectionAction/MoleculeByIdAction.cpp \
+        SelectionAction/MoleculeByOrderAction.cpp \
+        SelectionAction/MoleculeOfAtomAction.cpp \
+        SelectionAction/NotAllAtomsAction.cpp \
+        SelectionAction/NotAllAtomsInsideCuboidAction.cpp \
+        SelectionAction/NotAllAtomsInsideSphereAction.cpp \
+        SelectionAction/NotAllAtomsOfMoleculeAction.cpp \
+        SelectionAction/NotAllMoleculesAction.cpp \
+        SelectionAction/NotAtomByElementAction.cpp \
+        SelectionAction/NotAtomByIdAction.cpp \
+        SelectionAction/NotMoleculeByFormulaAction.cpp \
+        SelectionAction/NotMoleculeByIdAction.cpp \
+        SelectionAction/NotMoleculeOfAtomAction.cpp
+SELECTIONACTIONHEADER = \
+        SelectionAction/AllAtomsAction.hpp \
+        SelectionAction/AllAtomsInsideCuboidAction.hpp \
+        SelectionAction/AllAtomsInsideSphereAction.hpp \
+        SelectionAction/AllAtomsOfMoleculeAction.hpp \
+        SelectionAction/AllMoleculesAction.hpp \
+        SelectionAction/AtomByElementAction.hpp \
+        SelectionAction/AtomByIdAction.hpp \
+        SelectionAction/ClearAllAtomsAction.hpp \
+        SelectionAction/ClearAllMoleculesAction.hpp \
+        SelectionAction/MoleculeByFormulaAction.hpp \
+        SelectionAction/MoleculeByIdAction.hpp \
+        SelectionAction/MoleculeByOrderAction.hpp \
+        SelectionAction/MoleculeOfAtomAction.hpp \
+        SelectionAction/NotAllAtomsAction.hpp \
+        SelectionAction/NotAllAtomsInsideCuboidAction.hpp \
+        SelectionAction/NotAllAtomsInsideSphereAction.hpp \
+        SelectionAction/NotAllAtomsOfMoleculeAction.hpp \
+        SelectionAction/NotAllMoleculesAction.hpp \
+        SelectionAction/NotAtomByElementAction.hpp \
+        SelectionAction/NotAtomByIdAction.hpp \
+        SelectionAction/NotMoleculeByFormulaAction.hpp \
+        SelectionAction/NotMoleculeByIdAction.hpp \
+        SelectionAction/NotMoleculeOfAtomAction.cpp
+
 TESSELATIONACTIONSOURCE = \
   TesselationAction/ConvexEnvelopeAction.cpp \