diff options
| author | caro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | 2012-12-17 10:34:48 +0000 |
|---|---|---|
| committer | caro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | 2012-12-17 10:34:48 +0000 |
| commit | 92bf8547475818ecf315271291cca33cd4c12852 (patch) | |
| tree | 3babfcce30fde4fd0ac59ada483db882032a79fd | |
| parent | 2eda04aecea1c66c025190cda9ffcac9f21623a1 (diff) | |
| download | eeze-92bf8547475818ecf315271291cca33cd4c12852.tar.gz eeze-92bf8547475818ecf315271291cca33cd4c12852.tar.bz2 eeze-92bf8547475818ecf315271291cca33cd4c12852.zip | |
XML output
Add XML output to doc
Add installation rule for doc
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/eeze-1.7@81116 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | doc/Doxyfile.in | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 20 | ||||
| -rw-r--r-- | eeze.pc.in | 2 |
6 files changed, 30 insertions, 6 deletions
@@ -135,4 +135,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 4d9f2c5..9916f0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,10 +35,14 @@ eeze.spec.in \ eeze.spec \ m4/efl_doxygen.m4 -.PHONY: doc +.PHONY: doc install-doc # Documentation doc: all @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 66e8197..d59651f 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,9 @@ echo echo "IPv6...................: ${have_ipv6}" 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 da43f44..1dadc4e 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -53,7 +53,7 @@ GENERATE_TAGFILE = GENERATE_TESTLIST = YES GENERATE_TODOLIST = YES GENERATE_TREEVIEW = NO -GENERATE_XML = NO +GENERATE_XML = YES GRAPHICAL_HIERARCHY = NO HAVE_DOT = NO HHC_LOCATION = diff --git a/doc/Makefile.am b/doc/Makefile.am index aed7b5f..b57313d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in eeze.dox -.PHONY: doc +.PHONY: doc install-doc PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc @@ -9,13 +9,16 @@ 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 cp $(srcdir)/img/* latex/ 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 +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.in $(wildcard img/*.*) e.css head.html foot.html eeze.dox.in @@ -1,7 +1,9 @@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +docdir=@docdir@ Name: eeze Description: device convenience library for efl |