Changeset be848d for src/Actions/Makefile.am

Timestamp:

Jun 21, 2017, 10:02:14 PM (9 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, Candidate_v1.7.0, Candidate_v1.7.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, stable

Children:

78ea3c

Parents:

9a9f847 (diff), 6116df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GeometryObjects' into Candidate_v1.6.1

File:

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

src/Actions/Makefile.am

@@ -64 +64 @@
   ${FILLACTIONSOURCE} \
   ${FRAGMENTATIONACTIONSOURCE} \
+  ${GEOMETRYACTIONSOURCE} \
   ${GRAPHACTIONSOURCE} \
   ${MOLECULEACTIONSOURCE} \
@@ -84 +85 @@
   ${FILLACTIONHEADER} \
   ${FRAGMENTATIONACTIONHEADER} \
+  ${GEOMETRYACTIONHEADER} \
   ${GRAPHACTIONHEADER} \
   ${MOLECULEACTIONHEADER} \
@@ -104 +106 @@
   ${FILLACTIONDEFS} \
   ${FRAGMENTATIONACTIONDEFS} \
+  ${GEOMETRYACTIONDEFS} \
   ${GRAPHACTIONDEFS} \
   ${MOLECULEACTIONDEFS} \
@@ -285 +288 @@
   Actions/FragmentationAction/StoreSaturatedFragmentAction.def \
   Actions/FragmentationAction/StructuralOptimizationAction.def
+
+GEOMETRYACTIONSOURCE = \
+        Actions/GeometryAction/GeometryDistanceToVectorAction.cpp \
+        Actions/GeometryAction/GeometryInputToVectorAction.cpp \
+        Actions/GeometryAction/GeometryPlaneToVectorAction.cpp \
+        Actions/GeometryAction/GeometryPositionToVectorAction.cpp \
+        Actions/GeometryAction/GeometryRemoveAction.cpp
+GEOMETRYACTIONHEADER = \
+        Actions/GeometryAction/GeometryDistanceToVectorAction.hpp \
+        Actions/GeometryAction/GeometryInputToVectorAction.hpp \
+        Actions/GeometryAction/GeometryPlaneToVectorAction.hpp \
+        Actions/GeometryAction/GeometryPositionToVectorAction.hpp \
+        Actions/GeometryAction/GeometryRemoveAction.hpp
+GEOMETRYACTIONDEFS = \
+        Actions/GeometryAction/GeometryDistanceToVectorAction.def \
+        Actions/GeometryAction/GeometryInputToVectorAction.def \
+        Actions/GeometryAction/GeometryPlaneToVectorAction.def \
+        Actions/GeometryAction/GeometryPositionToVectorAction.def \
+        Actions/GeometryAction/GeometryRemoveAction.def
 
 GRAPHACTIONSOURCE = \