From 14b353a66b00c03acd1d5c313186fc2c697d5760 Mon Sep 17 00:00:00 2001 From: antognolli Date: Mon, 6 Jun 2011 20:20:38 +0000 Subject: [PATCH] eina: fix doc building when srcdir != builddir. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@60004 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 1 + doc/{Doxyfile => Doxyfile.in} | 12 ++++++------ doc/Makefile.am | 12 ++++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) rename doc/{Doxyfile => Doxyfile.in} (99%) diff --git a/configure.ac b/configure.ac index ba43320..ff95b3b 100644 --- a/configure.ac +++ b/configure.ac @@ -649,6 +649,7 @@ Makefile eina.pc eina.spec doc/Makefile +doc/Doxyfile src/Makefile src/include/Makefile src/include/eina_config.h diff --git a/doc/Doxyfile b/doc/Doxyfile.in similarity index 99% rename from doc/Doxyfile rename to doc/Doxyfile.in index 9c471e9..762d70a 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -31,7 +31,7 @@ PROJECT_NAME = Eina # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = @PACKAGE_VERSION@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -513,7 +513,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../src/include ../src/lib +INPUT = @top_srcdir@/src/include @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 @@ -542,7 +542,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = ../src/lib/eina_amalgamation.c +EXCLUDE = @top_srcdir@/src/lib/eina_amalgamation.c # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -720,13 +720,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 @@ -735,7 +735,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 8bd8de8..693082a 100644 --- a/doc/Makefile.am +++ b/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 $(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,8 @@ doc: endif -EXTRA_DIST = Doxyfile $(wildcard img/*.*) e.css head.html foot.html +EXTRA_DIST = $(srcdir)/Doxyfile.in \ + $(wildcard $(srcdir)/img/*.*) \ + $(srcdir)/e.css \ + $(srcdir)/head.html \ + $(srcdir)/foot.html -- 2.7.4