27 Feb
2012
27 Feb
'12
3:05 p.m.
* Makefile.am,
* doc/Makefile.am: Here.
---
ChangeLog | 7 +++++++
Makefile.am | 11 ++++++++---
doc/Makefile.am | 25 +++++++++++++++----------
3 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c30b9ff..1ff3c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Fix dependencies in Makefiles.
+
+ * Makefile.am,
+ * doc/Makefile.am: Here.
+
+2012-02-27 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Fix Path to Olena logo.
* doc/logo.jpg: Move...
diff --git a/Makefile.am b/Makefile.am
index 677a9c3..ef6090a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development
-# Laboratory (LRDE).
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and
+# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -17,7 +17,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = build-aux doc external milena
+SUBDIRS = build-aux external milena
if ENABLE_SWILENA
SUBDIRS += swilena
@@ -27,6 +27,11 @@ if ENABLE_SCRIBO
SUBDIRS += scribo
endif ENABLE_SCRIBO
+# We rely on Automake to ensure that the documentions are generated in
+# the right order. Here, we make sure that the general documentation
+# will be generated after milena's and scribo'd documentation.
+SUBDIRS += doc
+
# Target shortcuts delegating the actual action to milena/Makefile.
LOCAL_RECURSIVE_TARGETS = pretty-check tests
$(LOCAL_RECURSIVE_TARGETS):
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 099b497..8a45e4e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,9 +35,6 @@ TEXI2DVI_FLAGS += \
-I $(srcdir) -I $(srcdir)/outputs -I $(srcdir)/outputs/split \
-I $(srcdir)/img -I $(srcdir)/examples/split
-# Additional files for LaTeX compilations.
-DOC_PACKAGES = doxyfuns.sty milena.sty
-
# ----------------------- #
# User Reference Manual. #
@@ -55,27 +52,38 @@ DOXYFILE_USER = Doxyfile_user
# Images
-REFMAN_IMAGES = $(srcdir)/images/olena_layers.png
-EXTRA_DIST = $(REFMAN_IMAGES)
+REFMAN_IMAGES = \
+ $(srcdir)/images/olena_layers.png \
+ $(srcdir)/images/logo.jpg
+
+EXTRA_DIST = \
+ $(REFMAN_IMAGES) \
+ $(srcdir)/images/olena_layers.svg
# Documentation content
REFMAN_deps = $(srcdir)/footer.html \
$(srcdir)/header.html \
$(srcdir)/doxygen.css \
$(srcdir)/mainpage.dox \
+ $(srcdir)/about.dox \
$(srcdir)/DoxygenLayout.xml \
$(srcdir)/modules_list.dox \
$(srcdir)/olena.bib \
+ $(srcdir)/lrde.bib \
+ $(srcdir)/doc.bib \
$(srcdir)/contributors.dox \
$(srcdir)/bibliography.dox \
$(srcdir)/license.dox \
$(srcdir)/license_commercial.dox \
$(srcdir)/online_resources.dox \
$(srcdir)/get_sources.dox \
+ $(srcdir)/subdoc_footer.html \
contributors.html \
lrde_olena.html \
$(REFMAN_IMAGES)
+
+
# Sed is used to generate Doxyfile from Doxyfile.in instead of
# configure, because the former is way faster than the latter.
#
@@ -142,13 +150,13 @@ contributors.html: $(top_srcdir)/AUTHORS
## Bibliography. ##
## -------------- ##
-# Warning: also generate lrde_olena.cite
+# Warning: also generates lrde_olena.cite
lrde_olena.bib:
bib2bib -s plain -oc lrde_olena.cite -ob lrde_olena.bib -c \
'project = "Image" or project = "Olena"' \
-s year -r $(srcdir)/lrde.bib
-# Warning: also generate lrde_olena_bib.html
+# Warning: also generates lrde_olena_bib.html
lrde_olena.html: lrde_olena.bib
bibtex2html -s plain -nokeywords -citefile lrde_olena.cite \
-noabstract -nofooter -labelname -nodoc -linebreak -nf urllrde PDF lrde_olena.bib
@@ -163,11 +171,8 @@ MAINTAINERCLEANFILES += lrde_olena.cite \
## Cleaning. ##
## ---------- ##
-MAINTAINERCLEANFILES += $(dist_pdf_DATA)
-
maintainer-clean-local:
-rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN)
- -rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN)
-for d in $(DATA_html_dirs); do \
rm -rf $$d.tmp $(srcdir)/$$d; \
done
--
1.7.2.5