From 4a8437d838cc993bb1083ad036f0f74814265f40 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Mon, 13 Jun 2011 17:31:21 +0000 Subject: [PATCH] ecore: fix doc build when srcdir != builddir. SVN revision: 60286 --- legacy/ecore/configure.ac | 1 + legacy/ecore/doc/{Doxyfile => Doxyfile.in} | 14 +++++++------- legacy/ecore/doc/Makefile.am | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) rename legacy/ecore/doc/{Doxyfile => Doxyfile.in} (94%) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index d5b0b46..d689ee8 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -1439,6 +1439,7 @@ ecore-wince.pc ecore.pc doc/ecore.dox doc/Makefile +doc/Doxyfile src/Makefile src/bin/Makefile src/lib/Makefile diff --git a/legacy/ecore/doc/Doxyfile b/legacy/ecore/doc/Doxyfile.in similarity index 94% rename from legacy/ecore/doc/Doxyfile rename to legacy/ecore/doc/Doxyfile.in index 5992902..79d731a 100644 --- a/legacy/ecore/doc/Doxyfile +++ b/legacy/ecore/doc/Doxyfile.in @@ -73,16 +73,16 @@ WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = -INPUT = ./ecore.dox \ - ../src/lib +INPUT = @srcdir@/ecore.dox \ + @top_srcdir@/src/lib INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = YES -EXCLUDE = ../src/lib/ecore_config/* ../src/lib/ecore_x/xcb/*.c +EXCLUDE = @top_srcdir@/src/lib/ecore_config/* @top_srcdir@/src/lib/ecore_x/xcb/*.c EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = ecore_config* Ecore_Config* EXCLUDE_SYMBOLS = Ecore_Config* -EXAMPLE_PATH = ../examples/ +EXAMPLE_PATH = @top_srcdir@/examples/ EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = YES IMAGE_PATH = img @@ -103,9 +103,9 @@ IGNORE_PREFIX = 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_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_GAMMA = 80 diff --git a/legacy/ecore/doc/Makefile.am b/legacy/ecore/doc/Makefile.am index 0ea8777..8547b40 100644 --- a/legacy/ecore/doc/Makefile.am +++ b/legacy/ecore/doc/Makefile.am @@ -7,18 +7,18 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc if EFL_BUILD_DOC doc-clean: - rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar* + rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* 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,4 @@ doc: endif -EXTRA_DIST = Doxyfile $(wildcard img/*.*) e.css head.html foot.html ecore.dox.in +EXTRA_DIST = Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html ecore.dox.in -- 2.7.4