From a77179a60bd98bb5d97421fda500b6f7b9f719f2 Mon Sep 17 00:00:00 2001 From: antognolli Date: Mon, 13 Jun 2011 17:53:28 +0000 Subject: [PATCH] edje: fix doc build when srcdir != builddir. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@60289 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 1 + doc/{Doxyfile => Doxyfile.in} | 12 ++++++------ doc/Makefile.am | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) rename doc/{Doxyfile => Doxyfile.in} (99%) diff --git a/configure.ac b/configure.ac index c8e57c7..e897f07 100644 --- a/configure.ac +++ b/configure.ac @@ -380,6 +380,7 @@ Makefile data/Makefile data/include/Makefile doc/Makefile +doc/Doxyfile doc/edje.dox src/Makefile src/lib/Makefile diff --git a/doc/Doxyfile b/doc/Doxyfile.in similarity index 99% rename from doc/Doxyfile rename to doc/Doxyfile.in index 29432d5..cb04f48 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -114,7 +114,7 @@ FULL_PATH_NAMES = YES # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = ../ src/ +STRIP_FROM_PATH = @top_srcdir@/ src/ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -586,7 +586,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = edje.dox ../src/bin/edje_cc_handlers.c ../src/lib +INPUT = @srcdir@/edje.dox @top_srcdir@/src/bin/edje_cc_handlers.c @top_srcdir@/src/lib # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -643,7 +643,7 @@ EXCLUDE_SYMBOLS = # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = examples/ +EXAMPLE_PATH = @top_srcdir@/src/examples/ # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -797,13 +797,13 @@ HTML_FILE_EXTENSION = .html # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = head.html +HTML_HEADER = @srcdir@/head.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = foot.html +HTML_FOOTER = @srcdir@/foot.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to @@ -812,7 +812,7 @@ HTML_FOOTER = foot.html # the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = e.css +HTML_STYLESHEET = @srcdir@/e.css # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, # files or namespaces will be aligned in HTML using tables. If set to diff --git a/doc/Makefile.am b/doc/Makefile.am index 45d97a8..f5baff0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,18 +8,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 -- 2.7.4