Commit b7c21129 authored by Olaf Lenz's avatar Olaf Lenz

Simplified and improved doc build.

parent cd390ff1
......@@ -67,23 +67,3 @@ dist-hook:
fi;
endif
#################################################################
# Documentation
#################################################################
if DEVEL_SRC
.PHONY: FORCE doc ug dg tutorials doxygen
ug dg tutorials: FORCE
cd doc; $(MAKE) --print-directory $@
else
.PHONY: FORCE doc doxygen
endif
doc doxygen: FORCE
cd src; $(MAKE) --print-directory $@
cd doc; $(MAKE) --print-directory $@
FORCE:
......@@ -594,6 +594,7 @@ cat <<EOF
****************************************************************
EOF
# Creating the output
AM_EXTRA_RECURSIVE_TARGETS([doc ug dg tutorials doxygen])
AC_CONFIG_HEADERS([src/acconfig.hpp])
AC_CONFIG_FILES([
Makefile
......
......@@ -18,24 +18,5 @@
#
SUBDIRS = logo doxygen dg ug tutorials
if DEVEL_SRC
dg-local ug-local tutorials-local: latexit.sh
.PHONY: FORCE doc ug dg tutorials doxygen
doc: ug dg tutorials doxygen
dg: latexit.sh FORCE
cd dg; $(MAKE) --print-directory $@
ug: latexit.sh FORCE
cd ug; $(MAKE) --print-directory $@
tutorials: latexit.sh FORCE
cd tutorials; $(MAKE) --print-directory $@
else
.PHONY: FORCE doc doxygen
doc: doxygen
endif
doxygen: FORCE
cd doxygen; $(MAKE) --print-directory $@
FORCE:
......@@ -28,10 +28,8 @@ dg_FILES = \
# bibliography.bib
.PHONY: doc dg
doc: dg
dg: dg.pdf
doc-local: dg
dg-local: dg.pdf
dg.pdf: $(dg_FILES)
if HAVE_LATEX
......
......@@ -40,13 +40,14 @@ EXTRA_DIST = \
figs/particles.fig \
figs/particles.gif
.PHONY: doc doxygen
doc: doxygen
doc-local: doxygen
doxygen:
doxygen-local:
if HAVE_DOXYGEN
SRCDIR=$(srcdir) AWK=$(AWK)\
$(SHELL) $(srcdir)/background_errors.sh $(top_srcdir)/src/*.c $(top_srcdir)/src/*.h
$(SHELL) $(srcdir)/background_errors.sh \
$(top_srcdir)/src/*.cpp $(top_srcdir)/src/*.hpp \
$(top_srcdir)/src/tcl/*.cpp $(top_srcdir)/src/tcl/*.hpp
ESPRESSO_VERSION=`cd $(top_srcdir); sh config/genversion.sh` \
PACKAGE="ESPResSo $$ESPRESSO_VERSION" \
SRCDIR=$(top_srcdir) INCLUDEDIR=$(top_builddir) \
......
......@@ -47,10 +47,8 @@ tutorial_FILES = \
$(tutorial_TEXFILES) \
$(tutorial_FIGURES)
.PHONY: doc $(BASENAME).pdf
doc: tutorials
tutorials: $(BASENAME).pdf
doc-local: tutorials
tutorials-local: $(BASENAME).pdf
$(BASENAME).pdf: $(tutorial_FILES) ../common/common.tex
if HAVE_LATEX
sh ../../latexit.sh $(srcdir):$(top_srcdir)/doc/tutorials/common $(BASENAME)
......
......@@ -37,10 +37,8 @@ tutorial_FILES = \
$(tutorial_TEXFILES) \
$(tutorial_FIGURES)
.PHONY: doc $(BASENAME).pdf
doc: tutorials
tutorials: $(BASENAME).pdf
doc-local: tutorials
tutorials-local: $(BASENAME).pdf
$(BASENAME).pdf: $(tutorial_FILES) ../common/common.tex
if HAVE_LATEX
sh ../../latexit.sh $(srcdir):$(srcdir)/../common $(BASENAME)
......
......@@ -17,15 +17,3 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS=01-lennard_jones 02-charged_system
if DEVEL_SRC
.PHONY: FORCE doc tutorials $(SUBDIRS)
doc: tutorials
tutorials: FORCE
for dir in $(SUBDIRS); do \
cd $$dir; $(MAKE) --print-directory $@; cd ..;\
done
FORCE:
endif
......@@ -64,10 +64,10 @@ ug_FILES = \
otherrefs.bib \
todonotes.sty
.PHONY: doc ug FORCE
.PHONY: FORCE
doc: ug
ug: ug.pdf
doc-local: ug
ug-local: ug.pdf
dist-hook: ug-dist.pdf
cp ug-dist.pdf $(distdir)/ug.pdf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment