From ccad473d7242b7580f591905f1ab9e78dc8b44e9 Mon Sep 17 00:00:00 2001 From: antognolli Date: Mon, 6 Jun 2011 20:29:10 +0000 Subject: [PATCH] eet: fix 'make doc' when srcdir != builddir. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eet@60006 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 1 + doc/{Doxyfile => Doxyfile.in} | 12 ++++++------ doc/Makefile.am | 11 ++++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) rename doc/{Doxyfile => Doxyfile.in} (92%) diff --git a/configure.ac b/configure.ac index fbe8635..2a0254b 100644 --- a/configure.ac +++ b/configure.ac @@ -427,6 +427,7 @@ AC_OUTPUT([ Makefile eet.pc doc/Makefile +doc/Doxyfile doc/eet.dox src/Makefile src/lib/Makefile diff --git a/doc/Doxyfile b/doc/Doxyfile.in similarity index 92% rename from doc/Doxyfile rename to doc/Doxyfile.in index 7339619..5a68cdd 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -1,15 +1,15 @@ PROJECT_NAME = Eet -PROJECT_NUMBER = +PROJECT_NUMBER = @PACKAGE_VERSION@ OUTPUT_DIRECTORY = . -INPUT = eet.dox examples.dox ../src/lib +INPUT = @srcdir@/eet.dox @srcdir@/examples.dox @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 = NO EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = -EXAMPLE_PATH = ../src/examples/ +EXAMPLE_PATH = @top_srcdir@/src/examples/ EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO INPUT_FILTER = diff --git a/doc/Makefile.am b/doc/Makefile.am index 0793a9a..265d9ec 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,14 +12,14 @@ doc-clean: doc: 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 @@ -30,4 +30,9 @@ doc: endif -EXTRA_DIST = Doxyfile e.css foot.html head.html $(wildcard img/*.*) eet.dox.in +EXTRA_DIST = $(srcdir)/Doxyfile \ + $(srcdir)/e.css \ + $(srcdir)/foot.html \ + $(srcdir)/head.html \ + $(srcdir)/$(wildcard $(srcdir)/img/*.*) \ + $(srcdir)/eet.dox.in -- 2.7.4