Changeset ec188c for LinearAlgebra


Ignore:
Timestamp:
Sep 30, 2011, 8:18:02 AM (14 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.
Location:
LinearAlgebra
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • LinearAlgebra/Makefile.am

    r632a52 rec188c  
    11ACLOCAL_AMFLAGS = -I m4
    2 SUBDIRS = src/LinearAlgebra src/unittests tests/CodeChecks doc 
     2SUBDIRS = src/LinearAlgebra src/unittests tests/CodeChecks doc
    33
    44AUTOMAKE_OPTIONS = subdir-objects
    55
    6 EXTRA_DIST = bootstrap
     6#include doc/am_doxygen_include.am
     7
     8EXTRA_DIST = \
     9        bootstrap \
     10        m4/ac_doxygen.m4 \
     11        m4/ax_codepatterns.m4 \
     12        m4/boost.m4 \
     13        m4/cppunit.m4
     14
     15#        doc/am_doxygen_include.am
    716
    817.PHONY: doc
    918doc:
    10         cd doc && make doxygen-docs
    11        
     19        cd doc && make doxygen-doc
     20
    1221unity:
    1322        cd src && make unity

  • LinearAlgebra/configure.ac

    r632a52 rec188c  
    1919AC_PROG_CC
    2020AC_PROG_INSTALL
    21 AC_CHECK_PROG([LATEX],[latex],[latex],[:])
    22 AC_CHECK_PROG([BIBTEX],[bibtex],[bibtex],[:])
    23 AC_CHECK_PROG([DVIPS],[dvips],[dvips],[:])
    24 AC_CHECK_PROG([PDFLATEX],[pdflatex],[pdflatex],[:])
    25 AC_CHECK_PROG([XMLTO],[xmlto],[xmlto],[:])
    26 AM_MISSING_PROG([DOXYGEN], [doxygen])
     21
     22DX_HTML_FEATURE(ON)
     23DX_PS_FEATURE(OFF)
     24DX_PDF_FEATURE(OFF)
     25DX_INIT_DOXYGEN(LinearAlgebra, Doxyfile, $(docdir))
    2726
    2827LT_INIT([static])

  • LinearAlgebra/doc/Doxyfile

    r632a52 rec188c  
    44# Project related configuration options
    55#---------------------------------------------------------------------------
    6 PROJECT_NAME           = Molecuilder
    7 PROJECT_NUMBER         = 1.0
    8 OUTPUT_DIRECTORY       = ../doc
     6PROJECT_NAME           = $(PROJECT)
     7PROJECT_NUMBER         = $(VERSION)
     8OUTPUT_DIRECTORY       = $(DOCDIR)
    99CREATE_SUBDIRS         = NO
    1010OUTPUT_LANGUAGE        = English
    … …  
    8383# configuration options related to the input files
    8484#---------------------------------------------------------------------------
    85 INPUT                  = ../src
     85INPUT                  = $(TOPSRCDIR)/src
    8686FILE_PATTERNS          = *.c \
    8787                         *.cc \

  • LinearAlgebra/doc/Makefile.am

    • Property mode changed from 100755 to 100644
    r632a52 rec188c  
    1 EXTRA_DIST = \
    2         Doxyfile \
    3         html
    41
    5 SRCMANDOCS =
     2include am_doxygen_include.am
    63
    7 GENMANDOCS =
    8 
    9 dist_man_MANS = $(SRCMANDOCS) $(GENMANDOCS)
    10 dist_doc_DATA = $(PDFFILES)
    11 
    12 SUFFIXES = .pdf .ps .dvi .tex .xml .html
    13 
    14 html-local: doxygen-docs
    15 
    16 doxygen-docs:
    17         cd $(srcdir) && $(DOXYGEN)
    18 
    19 .xml.ps:
    20         $(XMLTO) $(XMLTOFLAGS) ps $<
    21         @touch $@
    22 
    23 .xml.html:
    24         $(XMLTO) $(XMLTOFLAGS) html-nochunks $<
    25         @touch $@
    26 
    27 clean-local:
    28         rm -f *.aux *.bbl *.blg *.log *.aux.bak
    29 distclean-local:
    30         rm -f *.dvi *.ps *.pdf *.html $(GENMANDOCS)
    31 
    32 .PHONY: allclean doxygen-docs
    33 allclean: distclean
    34 
    35 
     4EXTRA_DIST = am_doxygen_include.am
Note: See TracChangeset for help on using the changeset viewer.