Changeset c20b35
- Timestamp:
- Nov 7, 2011, 12:24:00 PM (13 years ago)
- 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:
- 3139b2
- Parents:
- 949953
- git-author:
- Frederik Heber <heber@…> (09/26/11 13:09:24)
- git-committer:
- Frederik Heber <heber@…> (11/07/11 12:24:00)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Actions/Makefile.am
r949953 rc20b35 400 400 Actions/WorldAction/SetWorldTimeAction.def 401 401 402 #ACTIONPYTHONSOURCE_WITHDIR = $(ACTIONPROTOTYPESSOURCE:Action.cpp=Action.python.cpp) 403 #ACTIONPYTHONSOURCE = $(notdir $(ACTIONPYTHONSOURCE_WITHDIR)) 402 404 403 405 noinst_LTLIBRARIES += \ 404 406 libMolecuilderActions.la \ 405 407 libMolecuilderActionPrototypes.la 408 # libMolecuilderActionPython.la 406 409 libMolecuilderActions_la_includedir = $(includedir)/MoleCuilder/Actions/ 407 410 libMolecuilderActionPrototypes_la_includedir = $(includedir)/MoleCuilder/Actions/ 411 #libMolecuilderActionPython_la_includedir = $(includedir)/MoleCuilder/Actions/ 408 412 409 413 BUILT_SOURCES += AllActionHeaders.hpp AllActionPython.hpp 414 #$(ACTIONPYTHONSOURCE) 410 415 411 416 # UIElements/libMolecuilderUI.la … … 413 418 nobase_libMolecuilderActionPrototypes_la_include_HEADERS = ${ACTIONPROTOTYPESHEADER} ${ACTIONPROTOTYPESDEFS} AllActionHeaders.hpp 414 419 nodist_libMolecuilderActionPrototypes_la_include_HEADERS = AllActionHeaders.hpp 420 #nobase_libMolecuilderActionPython_la_include_HEADERS = ${ACTIONPROTOTYPESHEADER} ${ACTIONPROTOTYPESDEFS} 421 #nodist_libMolecuilderActionPython_la_include_HEADERS = AllActionHeaders.hpp 415 422 416 423 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la" … … 424 431 libMolecuilderActions_la_SOURCES = ${ACTIONSSOURCE} 425 432 libMolecuilderActionPrototypes_la_SOURCES = ${ACTIONPROTOTYPESSOURCE} 433 #libMolecuilderActionPython_la_SOURCES = ${ACTIONPYTHONSOURCE} 426 434 427 435 ## Instruct libtool to include ABI version information in the generated shared … … 451 459 #pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc 452 460 461 #SUFFIXES = .pytho n.cpp 462 #.python.cpp: $*.def 463 # echo "#include \"$<\"" >$@; \ 464 # echo "#include \"Actions/Action_impl_python.hpp\"" >>$@; \ 465 # echo "#include \"Actions/Action_impl_undef.hpp\"" >>$@; 466 453 467 AllActionHeaders.hpp: $(ACTIONPROTOTYPESHEADER) 454 468 echo "#ifndef ALLACTIONHEADERS_HPP_" >$@; \ … … 473 487 AllActionHeaders.hpp \ 474 488 AllActionPython.hpp 489 #$(ACTIONPYTHONSOURCE)
Note:
See TracChangeset
for help on using the changeset viewer.