XML output

Add XML output to doc
Add installation rule for doc

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

diff --git a/ChangeLog b/ChangeLog
index 49bfad3..692ed1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,4 +61,7 @@
 
        * 1.7.3 release
 
+2012-12-17 Vincent Torri
 
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 5c70db3..0348f06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,10 +35,14 @@ embryo.spec
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = embryo.pc
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
 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 6fb15fc..d30883f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,9 @@ echo
 echo "  Build embryo_cc......: $have_embryo_cc"
 echo
 echo "  Documentation........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo "    Installation.......: make install-doc"
+fi
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 5476347..3bd5ce3 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -101,7 +101,7 @@ GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = YES
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 XML_SCHEMA             = 
 XML_DTD                = 
 GENERATE_AUTOGEN_DEF   = NO

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 91c79f3..0fe0d9a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,6 @@
-
 MAINTAINERCLEANFILES = Makefile.in embryo.dox
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
@@ -10,12 +9,15 @@ if EFL_BUILD_DOC
 doc-clean:
        rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-doc: all doc-clean
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/img/* html/
+       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)/
@@ -23,11 +25,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 e.css foot.html head.html $(wildcard img/*.*) embryo.dox.in

diff --git a/embryo.pc.in b/embryo.pc.in
index 540f27c..22fce9d 100644 (file)
--- a/embryo.pc.in
+++ b/embryo.pc.in
@@ -1,3 +1,4 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
@@ -5,6 +6,7 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@/@PACKAGE@
 embryoincludedir=@embryoincludedir@
+docdir=@docdir@
 
 Name: embryo
 Description: A small virtual machine engine and bytecode compiler