Changeset ec188c
- Timestamp:
- Sep 30, 2011, 8:18:02 AM (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:
- 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)
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified LinearAlgebra/Makefile.am ¶
r632a52 rec188c 1 1 ACLOCAL_AMFLAGS = -I m4 2 SUBDIRS = src/LinearAlgebra src/unittests tests/CodeChecks doc 2 SUBDIRS = src/LinearAlgebra src/unittests tests/CodeChecks doc 3 3 4 4 AUTOMAKE_OPTIONS = subdir-objects 5 5 6 EXTRA_DIST = bootstrap 6 #include doc/am_doxygen_include.am 7 8 EXTRA_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 7 16 8 17 .PHONY: doc 9 18 doc: 10 cd doc && make doxygen-doc s11 19 cd doc && make doxygen-doc 20 12 21 unity: 13 22 cd src && make unity -
TabularUnified LinearAlgebra/configure.ac ¶
r632a52 rec188c 19 19 AC_PROG_CC 20 20 AC_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 22 DX_HTML_FEATURE(ON) 23 DX_PS_FEATURE(OFF) 24 DX_PDF_FEATURE(OFF) 25 DX_INIT_DOXYGEN(LinearAlgebra, Doxyfile, $(docdir)) 27 26 28 27 LT_INIT([static]) -
TabularUnified LinearAlgebra/doc/Doxyfile ¶
r632a52 rec188c 4 4 # Project related configuration options 5 5 #--------------------------------------------------------------------------- 6 PROJECT_NAME = Molecuilder7 PROJECT_NUMBER = 1.08 OUTPUT_DIRECTORY = ../doc6 PROJECT_NAME = $(PROJECT) 7 PROJECT_NUMBER = $(VERSION) 8 OUTPUT_DIRECTORY = $(DOCDIR) 9 9 CREATE_SUBDIRS = NO 10 10 OUTPUT_LANGUAGE = English … … 83 83 # configuration options related to the input files 84 84 #--------------------------------------------------------------------------- 85 INPUT = ../src85 INPUT = $(TOPSRCDIR)/src 86 86 FILE_PATTERNS = *.c \ 87 87 *.cc \ -
TabularUnified LinearAlgebra/doc/Makefile.am ¶
-
Property mode
changed from
100755
to100644
r632a52 rec188c 1 EXTRA_DIST = \2 Doxyfile \3 html4 1 5 SRCMANDOCS = 2 include am_doxygen_include.am 6 3 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 4 EXTRA_DIST = am_doxygen_include.am -
Property mode
changed from
-
TabularUnified Makefile.am ¶
r632a52 rec188c 1 1 ACLOCAL_AMFLAGS = -I m4 2 SUBDIRS = LinearAlgebra src src/unittests doc tests2 SUBDIRS = LinearAlgebra src src/unittests tests doc 3 3 4 4 AUTOMAKE_OPTIONS = subdir-objects 5 5 6 EXTRA_DIST = bootstrap 6 #include doc/am_doxygen_include.am 7 8 EXTRA_DIST = \ 9 bootstrap \ 10 m4/ac_doxygen.m4 \ 11 m4/acx_compilerflags.m4 \ 12 m4/ax_check_gl.m4 \ 13 m4/ax_check_glu.m4 \ 14 m4/ax_codepatterns.m4 \ 15 m4/boost.m4 \ 16 m4/cppunit.m4 \ 17 m4/gwqt4.m4 18 19 # doc/am_doxygen_include.am 7 20 8 21 .PHONY: doc 9 22 doc: 10 cd doc && make doxygen-doc s11 23 cd doc && make doxygen-doc 24 12 25 unity: 13 26 cd src && make unity -
TabularUnified configure.ac ¶
r632a52 rec188c 20 20 AC_PROG_CC 21 21 AC_PROG_INSTALL 22 AC_CHECK_PROG([LATEX],[latex],[latex],[:]) 23 AC_CHECK_PROG([BIBTEX],[bibtex],[bibtex],[:]) 24 AC_CHECK_PROG([DVIPS],[dvips],[dvips],[:]) 25 AC_CHECK_PROG([PDFLATEX],[pdflatex],[pdflatex],[:]) 26 AC_CHECK_PROG([XMLTO],[xmlto],[xmlto],[:]) 27 AM_MISSING_PROG([DOXYGEN], [doxygen]) 28 22 23 # use doxygen 24 DX_HTML_FEATURE(ON) 25 DX_PS_FEATURE(OFF) 26 DX_PDF_FEATURE(OFF) 27 DX_INIT_DOXYGEN(MoleCuilder, Doxyfile, $(docdir)) 28 29 # use libtool 29 30 LT_INIT([static]) 30 31 … … 224 225 AC_CONFIG_FILES([ 225 226 Makefile 226 doc/Makefile 227 doc/Makefile 227 228 src/Makefile 228 229 ]) -
TabularUnified doc/Doxyfile ¶
r632a52 rec188c 4 4 # Project related configuration options 5 5 #--------------------------------------------------------------------------- 6 PROJECT_NAME = Molecuilder7 PROJECT_NUMBER = 1.08 OUTPUT_DIRECTORY = ../doc6 PROJECT_NAME = $(PROJECT) 7 PROJECT_NUMBER = $(VERSION) 8 OUTPUT_DIRECTORY = $(DOCDIR) 9 9 CREATE_SUBDIRS = NO 10 10 OUTPUT_LANGUAGE = English … … 83 83 # configuration options related to the input files 84 84 #--------------------------------------------------------------------------- 85 INPUT = ../src85 INPUT = $(TOPSRCDIR)/src 86 86 FILE_PATTERNS = *.c \ 87 87 *.cc \ -
TabularUnified doc/Makefile.am ¶
-
Property mode
changed from
100755
to100644
r632a52 rec188c 1 EXTRA_DIST = \ 2 Doxyfile \ 3 html \ 4 molecuilder.xml \ 5 userguide.xml 1 include am_doxygen_include.am 6 2 7 SRCMANDOCS = 3 EXTRA_DIST = am_doxygen_include.am 8 4 9 GENMANDOCS = \10 molecuilder.1 \11 espack.conf.512 13 dist_man_MANS = $(SRCMANDOCS) $(GENMANDOCS)14 dist_doc_DATA = $(PDFFILES)15 16 SUFFIXES = .pdf .ps .dvi .tex .xml .html17 18 html-local: doxygen-docs19 20 doxygen-docs:21 cd $(srcdir) && $(DOXYGEN)22 23 .xml.ps:24 $(XMLTO) $(XMLTOFLAGS) ps $<25 @touch $@26 27 .xml.html:28 $(XMLTO) $(XMLTOFLAGS) html-nochunks $<29 @touch $@30 31 molecuilder.stamp: molecuilder.xml32 @rm -f molecuilder.tmp33 @touch molecuilder.tmp34 $(XMLTO) $(XMLTOFLAGS) man $<35 @touch $(GENMANDOCS)36 @mv -f molecuilder.tmp $@37 38 $(GENMANDOCS): molecuilder.stamp39 @if test -f $@; then touch $@; else \40 rm -f molecuilder.stamp; \41 $(MAKE) $(AM_MAKEFLAGS) molecuilder.stamp; \42 fi43 44 clean-local:45 rm -f *.aux *.bbl *.blg *.log *.aux.bak46 distclean-local:47 rm -f *.dvi *.ps *.pdf *.html $(GENMANDOCS) molecuilder.stamp48 49 .PHONY: allclean doxygen-docs50 allclean: distclean51 52 -
Property mode
changed from
-
TabularUnified m4/ac_doxygen.m4 ¶
r632a52 rec188c 79 79 if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then 80 80 AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) 81 AC_SUBST([DX_FLAG_ []DX_CURRENT_FEATURE], 0)81 AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0) 82 82 fi 83 83 ]) … … 102 102 # Turn off the DX_CURRENT_FEATURE if the required feature is off. 103 103 AC_DEFUN([DX_CLEAR_DEPEND], [ 104 test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_ []DX_CURRENT_FEATURE], 0)104 test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0) 105 105 ]) 106 106 … … 185 185 # Environment variables used inside doxygen.cfg: 186 186 DX_ENV_APPEND(SRCDIR, $srcdir) 187 DX_ENV_APPEND(TOPSRCDIR, \$(top_srcdir)) 187 188 DX_ENV_APPEND(PROJECT, $DX_PROJECT) 188 189 DX_ENV_APPEND(DOCDIR, $DX_DOCDIR)
Note:
See TracChangeset
for help on using the changeset viewer.