summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-17 10:34:48 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-17 10:34:48 +0000
commita8b6d37a46f4fbacc90f093e0bb67d2f7058f560 (patch)
tree0716a4871a14d445f658eb9a9e8516ca167c29f6
parent48c10cd414750da9c0532683fc8dd9df3c62a53e (diff)
XML output
Add XML output to doc Add installation rule for doc SVN revision: 81116
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac3
-rw-r--r--doc/Doxyfile.in2
-rw-r--r--doc/Makefile.am23
-rw-r--r--eina.pc.in2
6 files changed, 34 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 402e3ef..6cad1e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -380,3 +380,8 @@
3802012-12-13 Lucas De Marchi 3802012-12-13 Lucas De Marchi
381 381
382 * Fix EINA_INLIST_FOREACH_SAFE macro 382 * Fix EINA_INLIST_FOREACH_SAFE macro
383
3842012-12-17 Vincent Torri
385
386 * Add XML output to doc
387 * Add installation rule for doc
diff --git a/Makefile.am b/Makefile.am
index 6036f04..5ff1896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,13 +52,17 @@ m4/common/efl_voltron.m4 \
52m4/eina/eina_bench.m4 \ 52m4/eina/eina_bench.m4 \
53m4/eina/eina_check.m4 53m4/eina/eina_check.m4
54 54
55.PHONY: doc benchmark 55.PHONY: doc install-doc benchmark
56 56
57# Documentation 57# Documentation
58 58
59doc: 59doc:
60 @echo "entering doc/" 60 @echo "entering doc/"
61 @cd doc && $(MAKE) doc 61 @$(MAKE) -C doc doc
62
63install-doc:
64 @echo "entering doc/"
65 @$(MAKE) -C doc install-doc
62 66
63# Unit tests 67# Unit tests
64 68
diff --git a/configure.ac b/configure.ac
index 55707f2..e5e08dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -625,6 +625,9 @@ echo " File xattr...........: ${efl_func_setxattr}"
625echo " shm_open.............: ${efl_func_shm_open}" 625echo " shm_open.............: ${efl_func_shm_open}"
626echo 626echo
627echo " Documentation........: ${build_doc}" 627echo " Documentation........: ${build_doc}"
628if test "x${build_doc}" = "xyes" ; then
629echo " Installation.......: make install-doc"
630fi
628echo " Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})" 631echo " Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})"
629echo " Examples.............: ${enable_build_examples}" 632echo " Examples.............: ${enable_build_examples}"
630echo " Tiler Example........: ${build_tiler_example}" 633echo " Tiler Example........: ${build_tiler_example}"
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index cac9c1c..5137235 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1297,7 +1297,7 @@ MAN_LINKS = YES
1297# generate an XML file that captures the structure of 1297# generate an XML file that captures the structure of
1298# the code including all documentation. 1298# the code including all documentation.
1299 1299
1300GENERATE_XML = NO 1300GENERATE_XML = YES
1301 1301
1302# The XML_OUTPUT tag is used to specify where the XML pages will be put. 1302# The XML_OUTPUT tag is used to specify where the XML pages will be put.
1303# If a relative path is entered the value of OUTPUT_DIRECTORY will be 1303# If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 33a2c9b..b7d3a71 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3.PHONY: doc 3.PHONY: doc install-doc
4 4
5PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc 5PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
6 6
@@ -9,13 +9,15 @@ if EFL_BUILD_DOC
9doc-clean: 9doc-clean:
10 rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* 10 rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
11 11
12doc: all 12doc-build: all
13 $(efl_doxygen) 13 $(efl_doxygen)
14 cp $(srcdir)/img/* html/ 14 cp img/* html/
15 cp $(srcdir)/img/*.eps latex/ 15 cp img/* latex/
16
17doc: doc-build
16 rm -rf $(PACKAGE_DOCNAME).tar* 18 rm -rf $(PACKAGE_DOCNAME).tar*
17 mkdir -p $(PACKAGE_DOCNAME)/doc 19 mkdir -p $(PACKAGE_DOCNAME)/doc
18 cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc 20 cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc
19 tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ 21 tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
20 bzip2 -9 $(PACKAGE_DOCNAME).tar 22 bzip2 -9 $(PACKAGE_DOCNAME).tar
21 rm -rf $(PACKAGE_DOCNAME)/ 23 rm -rf $(PACKAGE_DOCNAME)/
@@ -25,11 +27,20 @@ doc: all
25 27
26clean-local: doc-clean 28clean-local: doc-clean
27 29
30install-doc: doc-build
31 install -d $(docdir)
32 cp -R html latex man xml $(docdir)
33
34uninstall-local:
35 rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
36
28else 37else
29 38
30doc: 39doc:
31 @echo "Documentation not built. Run ./configure --help" 40 @echo "Documentation not built. Run ./configure --help"
32 41
42install-doc: doc
43
33endif 44endif
34 45
35EXTRA_DIST = $(srcdir)/Doxyfile.in \ 46EXTRA_DIST = $(srcdir)/Doxyfile.in \
diff --git a/eina.pc.in b/eina.pc.in
index 95b815b..caaf153 100644
--- a/eina.pc.in
+++ b/eina.pc.in
@@ -1,7 +1,9 @@
1PACKAGE_TARNAME=@PACKAGE_TARNAME@
1prefix=@prefix@ 2prefix=@prefix@
2exec_prefix=@exec_prefix@ 3exec_prefix=@exec_prefix@
3libdir=@libdir@ 4libdir=@libdir@
4includedir=@includedir@ 5includedir=@includedir@
6docdir=@docdir@
5 7
6Name: Eina 8Name: Eina
7Description: A Library that implements fast data types and miscellaneous tools 9Description: A Library that implements fast data types and miscellaneous tools