XML output

Add XML output to doc
Add installation rule for doc

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ethumb-1.7@81116 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 7f8d30f..520d978 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,3 +25,8 @@
 2012-12-07  Luis Felipe Strano Moraes
 
        * Release 1.7.3
+
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 65c29ac..157a633 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,8 +34,12 @@ SUBDIRS = m4 src data doc
 
 ACLOCAL_AMFLAGS = -I m4
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 doc:
        @echo "entering doc/"
        $(MAKE) -C doc doc
+
+install-doc:
+       @echo "entering doc/"
+       make -C doc install-doc

diff --git a/configure.ac b/configure.ac
index 1e4d499..9bb1ce1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -256,7 +256,7 @@ Configuration Options Summary:
 
  * use xattr........: ${have_xattr}
  * maximum log level: ${with_max_log_level}
- * documentation....: ${build_doc}
+ * documentation....: ${build_doc} (installation: make install-doc)
 
 SUMMARY_EOF
 

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 5e32ca8..6a83f8d 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -987,7 +987,7 @@ MAN_LINKS              = YES
 # generate an XML file that captures the structure of 
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index aa62036..92f22e0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
@@ -10,13 +10,15 @@ if EFL_BUILD_DOC
 doc-clean:
        rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
 
-doc: all doc-clean
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/img/* html/
-       cp $(srcdir)/img/* latex/
+       cp img/* html/
+       cp img/* latex/
+
+doc: doc-build
        rm -rf $(PACKAGE_DOCNAME).tar*
        mkdir -p $(PACKAGE_DOCNAME)/doc
-       cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+       cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc
        tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
        bzip2 -9 $(PACKAGE_DOCNAME).tar
        rm -rf $(PACKAGE_DOCNAME)/
@@ -24,11 +26,20 @@ doc: all doc-clean
 
 clean-local: doc-clean
 
+install-doc: doc-build
+       install -d $(docdir)
+       cp -R html latex man xml $(docdir)
+
+uninstall-local:
+       rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
 else
 
 doc:
        @echo "Documentation not built. Run ./configure --help"
 
+install-doc: doc
+
 endif
 
 EXTRA_DIST = Doxyfile $(wildcard img/*.*) e.css head.html foot.html

diff --git a/ethumb.pc.in b/ethumb.pc.in
index 233e2ed..c850894 100644 (file)
--- a/ethumb.pc.in
+++ b/ethumb.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ethumb
 Description: Thumbnail Generator Library

diff --git a/ethumb_client.pc.in b/ethumb_client.pc.in
index c9eebc6..f71614b 100644 (file)
--- a/ethumb_client.pc.in
+++ b/ethumb_client.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ethumb_client
 Description: Thumbnail Client Library