Changeset ec188c for doc/Makefile.am

Timestamp:

Sep 30, 2011, 8:18:02 AM (13 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:

5a8f38

Parents:

632a52

git-author:

Frederik Heber <heber@…> (05/06/11 08:27:22)

git-committer:

Frederik Heber <heber@…> (09/30/11 08:18:02)

Message:

Fixed Doxygen usage.

• using now functions from ac_doxygen.m4, added TOP_SRCDIR to DX_ENV_APPENDs.
• Doxyfile's now used environment variables set by these functions.
• ac_doxygen.m4 patched with this due to "not a valid shell variable" bug: ​https://issues.apache.org/jira/browse/AMQCPP-191
• used aminclude.m4 from doxample (by Oren Ben-Tiki) renamed to ac_doxygen_include.am.
• added phony target doc that calls doxygen-doc for both molecuilder and LinearAlgebra.
• DOCUFIX: fixed a doxygen bug in analysis_correlation.cpp: getDipole().
• Doxyfile(s): Both INPUTs point now to $(TOP_SRCDIR)/src, which is correct for both (separate) packages.
• configure sets docdir as doc target dir.

File:

• doc/Makefile.am (modified) (1 diff, 1 prop)

doc/Makefile.am

@@ -1 @@
-EXTRA_DIST = \
-        Doxyfile \
-        html \
-        molecuilder.xml \
-        userguide.xml
+include am_doxygen_include.am
 
-SRCMANDOCS =
+EXTRA_DIST = am_doxygen_include.am
 
-GENMANDOCS = \
-        molecuilder.1 \
-        espack.conf.5
-
-dist_man_MANS = $(SRCMANDOCS) $(GENMANDOCS)
-dist_doc_DATA = $(PDFFILES)
-
-SUFFIXES = .pdf .ps .dvi .tex .xml .html
-
-html-local: doxygen-docs
-
-doxygen-docs:
-        cd $(srcdir) && $(DOXYGEN)
-
-.xml.ps:
-        $(XMLTO) $(XMLTOFLAGS) ps $<
-        @touch $@
-
-.xml.html:
-        $(XMLTO) $(XMLTOFLAGS) html-nochunks $<
-        @touch $@
-
-molecuilder.stamp: molecuilder.xml
-        @rm -f molecuilder.tmp
-        @touch molecuilder.tmp
-        $(XMLTO) $(XMLTOFLAGS) man $<
-        @touch $(GENMANDOCS)
-        @mv -f molecuilder.tmp $@
-
-$(GENMANDOCS): molecuilder.stamp
-        @if test -f $@; then touch $@; else \
-          rm -f molecuilder.stamp; \
-          $(MAKE) $(AM_MAKEFLAGS) molecuilder.stamp; \
-        fi
-
-clean-local: 
-        rm -f *.aux *.bbl *.blg *.log *.aux.bak
-distclean-local:
-        rm -f *.dvi *.ps *.pdf *.html $(GENMANDOCS) molecuilder.stamp
-
-.PHONY: allclean doxygen-docs
-allclean: distclean
-
-