From 22cfc5e480e7bd97f5e8aae2d180c2d851b009be Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Mon, 6 Jun 2011 20:27:01 +0000 Subject: [PATCH] evas: "make doc" now works when srcdir != builddir. SVN revision: 60005 --- legacy/evas/configure.ac | 1 + legacy/evas/doc/{Doxyfile => Doxyfile.in} | 12 ++++++------ legacy/evas/doc/Makefile.am | 11 ++++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) rename legacy/evas/doc/{Doxyfile => Doxyfile.in} (93%) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 720e87454c..479447508f 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -1612,6 +1612,7 @@ evas-software-sdl.pc evas.pc doc/evas.dox doc/Makefile +doc/Doxyfile src/Makefile src/bin/Makefile src/lib/Makefile diff --git a/legacy/evas/doc/Doxyfile b/legacy/evas/doc/Doxyfile.in similarity index 93% rename from legacy/evas/doc/Doxyfile rename to legacy/evas/doc/Doxyfile.in index d1c0539de5..845d70559e 100644 --- a/legacy/evas/doc/Doxyfile +++ b/legacy/evas/doc/Doxyfile.in @@ -1,15 +1,15 @@ PROJECT_NAME = Evas -PROJECT_NUMBER = +PROJECT_NUMBER = @PACKAGE_VERSION@ OUTPUT_DIRECTORY = . -INPUT = evas.dox ../src/lib +INPUT = @srcdir@/evas.dox @top_srcdir@/src/lib IMAGE_PATH = img OUTPUT_LANGUAGE = English GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = head.html -HTML_FOOTER = foot.html -HTML_STYLESHEET = e.css +HTML_HEADER = @srcdir@/head.html +HTML_FOOTER = @srcdir@/foot.html +HTML_STYLESHEET = @srcdir@/e.css HTML_ALIGN_MEMBERS = YES ENUM_VALUES_PER_LINE = 1 GENERATE_HTMLHELP = NO @@ -67,7 +67,7 @@ RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = -EXAMPLE_PATH = ../src/examples +EXAMPLE_PATH = @top_srcdir@/src/examples EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = YES INPUT_FILTER = diff --git a/legacy/evas/doc/Makefile.am b/legacy/evas/doc/Makefile.am index 1022871a02..1aeb0c08ae 100644 --- a/legacy/evas/doc/Makefile.am +++ b/legacy/evas/doc/Makefile.am @@ -11,14 +11,14 @@ doc-clean: doc: all doc-clean $(efl_doxygen) - cp img/* html/ + cp $(srcdir)/img/* html/ rm -rf $(PACKAGE_DOCNAME).tar* mkdir -p $(PACKAGE_DOCNAME)/doc cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ bzip2 -9 $(PACKAGE_DOCNAME).tar rm -rf $(PACKAGE_DOCNAME)/ - mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir) + mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) clean-local: doc-clean @@ -29,4 +29,9 @@ doc: endif -EXTRA_DIST = Doxyfile $(wildcard img/*.*) e.css head.html foot.html evas.dox.in +EXTRA_DIST = $(srcdir)/Doxyfile.in \ + $(wildcard $(srcdir)/img/*.*) \ + $(srcdir)/e.css \ + $(srcdir)/head.html \ + $(srcdir)/foot.html \ + $(srcdir)/evas.dox.in