diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index 85e4de270a..c14c7981d0 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/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/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index 932bf8bc6f..f0e4be6a80 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/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/legacy/ecore/src/lib/Makefile.am b/legacy/ecore/src/lib/Makefile.am
index 40f4640821..5eb2192006 100644
--- a/legacy/ecore/src/lib/Makefile.am
+++ b/legacy/ecore/src/lib/Makefile.am
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = \
 ecore \
 ecore_job \
diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am
index db5279d483..98b2e802c9 100644
--- a/legacy/evas/Makefile.am
+++ b/legacy/evas/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src
+SUBDIRS = src doc
 
 MAINTAINERCLEANFILES = \
 Makefile.in \
@@ -18,8 +18,6 @@ stamp-h.in \
 build-stamp \
 configure-stamp \
 depcomp \
-evas_docs.tar.gz \
-evas.c \
 README \
 evas-cairo-x11.pc \
 evas-directfb.pc \
@@ -41,7 +39,15 @@ evas-direct3d.pc \
 evas-software-16-wince.pc \
 evas-software-sdl.pc \
 evas.pc \
-evas.spec
+evas.spec \
+$(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 =
 
@@ -50,9 +56,6 @@ AUTHORS \
 COPYING \
 COPYING-PLAIN \
 autogen.sh \
-evas.c.in \
-gendoc \
-Doxyfile \
 README.in \
 README \
 evas.pc.in \
@@ -74,8 +77,7 @@ evas-software-16-ddraw.pc.in \
 evas-direct3d.pc.in \
 evas-software-16-wince.pc.in \
 evas-software-sdl.pc.in \
-evas.spec.in evas.spec \
-doc gendoc
+evas.spec.in evas.spec
 
 if BUILD_ENGINE_SOFTWARE_X11
 psoftwarex11 = evas-software-x11.pc
@@ -159,3 +161,9 @@ pkgconfig_DATA = \
 	$(psoftwarebuffer) $(psoftwareqtopia) $(popenglx11) $(pquartz) $(pcairox11) \
 	$(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) $(psoftwaresdl) \
 	$(psoftware16x11) $(pdirect3d) $(psoftware16ddraw) $(psoftware16wince) $(popenglglew)
+
+.PHONY: doc
+
+doc:
+	@echo "entering doc/"
+	$(MAKE) -C doc doc
diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index eed165dedc..2d9e61558a 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -906,6 +906,7 @@ if test x$want_valgrind = "xyes"; then
   )
 fi
 
+EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 #####################################################################
 ## Fill in flags
 
@@ -939,6 +940,8 @@ evas-direct3d.pc
 evas-software-16-wince.pc
 evas-software-sdl.pc
 evas.pc
+doc/evas.dox
+doc/Makefile
 src/Makefile
 src/lib/Makefile
 src/lib/canvas/Makefile
@@ -1116,6 +1119,8 @@ echo "  32bpp Rotation 90.......: $conv_32_rgb_rot_90"
 echo "  32bpp Rotation 180......: $conv_32_rgb_rot_180"
 echo "  32bpp Rotation 270......: $conv_32_rgb_rot_270"
 echo
+echo "Documentation.............: ${build_doc}"
+echo
 echo "------------------------------------------------------------------------"
 echo
 echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE,"
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_add/Makefile.am
index 8b2c2f3a62..78ce9fabe0 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_add/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 op_add_color_.c \
 op_add_color_i386.c \
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am
index 196dbd07e2..0895717f0f 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 op_blend_color_.c \
 op_blend_color_i386.c \
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_copy/Makefile.am
index 7c1a883c8b..9cbabcb239 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_copy/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 op_copy_color_.c \
 op_copy_color_i386.c \
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_mask/Makefile.am
index 848c3e42f4..47eefd295a 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_mask/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 op_mask_color_.c \
 op_mask_color_i386.c \
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_mul/Makefile.am
index 23a911bb6b..e3d0b82481 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_mul/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 op_mul_color_.c \
 op_mul_color_i386.c \
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_sub/Makefile.am
index cf0a068dee..a8eca1470d 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_sub/Makefile.am
@@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 EXTRA_DIST = \
 op_sub_color_.c \
 op_sub_color_i386.c \