Added support for "make doc" in evas and ecore.

Thanks to Lutin :)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@38545 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index 85e4de2..c14c798 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,12 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src
+SUBDIRS = doc src
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
                       ltconfig ltmain.sh missing mkinstalldirs \
                       stamp-h.in  build-stamp configure-stamp depcomp \
-                      ecore_docs.tar.gz ecore.c \
                       README \
                       ecore.spec \
                       ecore-con.pc \
@@ -27,13 +26,20 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                       ecore-sdl.pc \
                       ecore-quartz.pc \
                       ecore-wince.pc \
-                      ecore.pc
+                      ecore.pc \
+                      $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
+                      $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
+                      $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \
+                      m4/libtool.m4 \
+                      m4/lt~obsolete.m4 \
+                      m4/ltoptions.m4 \
+                      m4/ltsugar.m4 \
+                      m4/ltversion.m4
 
 bin_SCRIPTS = 
 
 EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \
-            autogen.sh ecore.c.in gendoc ecore.supp \
-             Doxyfile \
+            autogen.sh ecore.supp \
             ecore.pc.in \
             ecore-con.pc.in \
             ecore-config.pc.in \
@@ -51,8 +57,7 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \
             ecore-sdl.pc.in \
             ecore-quartz.pc.in \
             ecore-wince.pc.in \
-            ecore.spec.in ecore.spec \
-            doc gendoc
+            ecore.spec.in ecore.spec
 
 if BUILD_ECORE_CON
 pcon = ecore-con.pc
@@ -127,3 +132,10 @@ pkgconfig_DATA = \
        ecore.pc $(pcon) $(pconfig) $(pdfb) $(pevas) \
        $(pfb) $(pfile) $(pimf) $(pimfevas) $(pipc) $(pjob) $(ptxt) \
        $(px) $(pwin32) $(pwince) $(psdl) $(pquartz)
+
+.PHONY: doc
+
+doc:
+       @echo "entering doc/"
+       make -C doc doc
+

diff --git a/configure.ac b/configure.ac
index 932bf8b..f0e4be6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -895,6 +895,8 @@ fi
 
 ECORE_CHECK_MODULE([IMF_EVAS], [yes], [$try_ecore_imf_evas])
 
+EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
+
 dnl requirements
 AC_SUBST(requirements_ecore_con)
 AC_SUBST(requirements_ecore_config)
@@ -933,6 +935,8 @@ ecore-sdl.pc
 ecore-quartz.pc
 ecore-wince.pc
 ecore.pc
+doc/ecore.dox
+doc/Makefile
 src/Makefile
 src/bin/Makefile
 src/lib/Makefile
@@ -1067,5 +1071,7 @@ if test "x$have_ecore_evas" = "xyes" ; then
   echo "    Software 16bit WinCE.......: $have_ecore_evas_software_16_wince"
 fi
 echo
+echo " Documentation.................: ${build_doc}"
+echo
 echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE."
 echo

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 40f4640..5eb2192 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = \
 ecore \
 ecore_job \