Changeset 060e1e for src/Potentials/Makefile.am

Timestamp:

Jul 8, 2013, 2:22:01 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

8203ce8

Parents:

154e88

git-author:

Frederik Heber <heber@…> (05/09/13 12:16:33)

git-committer:

Frederik Heber <heber@…> (07/08/13 14:22:01)

Message:

Created AllPotentialHeaders.hpp from specific potentials headers in Makefile.am.

• this is copy&pasted from AllActionHeaders.hpp.
• so far, the potential is explicitly listed in PotentialFactory::createInstance(), hence we are not safe from harm, yet.

File:

• src/Potentials/Makefile.am (modified) (2 diffs)

src/Potentials/Makefile.am

@@ -24 +24 @@
   Potentials/PotentialRegistry.hpp \
   Potentials/SerializablePotential.hpp \
+  Potentials/Specifics/PotentialTypes.hpp \
+  Potentials/Specifics/PotentialTypes.def \
+  Potentials/Specifics/PotentialTypes.undef
+
+# add here headers for real potentials (i.e. the PotentialFactory should instantiate)  
+SPECIFICPOTENTIALSHEADER = \
   Potentials/Specifics/ManyBodyPotential_Tersoff.hpp \
   Potentials/Specifics/PairPotential_Angle.hpp \
   Potentials/Specifics/PairPotential_Harmonic.hpp \
   Potentials/Specifics/PairPotential_Morse.hpp \
-  Potentials/Specifics/PotentialTypes.hpp \
-  Potentials/Specifics/PotentialTypes.def \
-  Potentials/Specifics/PotentialTypes.undef \
   Potentials/Specifics/SaturationPotential.hpp
   
+BUILT_SOURCES += AllPotentialHeaders.hpp
 
 noinst_LTLIBRARIES += libMolecuilderPotentials.la
 libMolecuilderPotentials_la_includedir = $(includedir)/MoleCuilder/
 
-nobase_libMolecuilderPotentials_la_include_HEADERS = ${POTENTIALSHEADER}
+nobase_libMolecuilderPotentials_la_include_HEADERS = ${POTENTIALSHEADER} ${SPECIFICPOTENTIALSHEADER}
+nodist_libMolecuilderPotentials_la_include_HEADERS = AllPotentialHeaders.hpp
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -74 +79 @@
 #pkgconfigdir = $(libdir)/pkgconfig
 #pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
+
+AllPotentialHeaders.hpp: $(SPECIFICPOTENTIALSHEADER)
+        echo "#ifndef ALLPOTENTIALHEADERS_HPP_" >$@; \
+        echo "#define ALLPOTENTIALHEADERS_HPP_" >>$@; \
+        for file in $(SPECIFICPOTENTIALSHEADER); do \
+                echo "#include \"$$file\"" >>$@; \
+        done; \
+        echo "#endif /* ALLPOTENTIALHEADERS_HPP_ */" >>$@;
+
+MOSTLYCLEANFILES += \
+        AllPotentialHeaders.hpp
+