diff --git a/Makefile.am b/Makefile.am
index 509967f..a0e98d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,17 @@
-SUBDIRS = src doc 
+SUBDIRS = src 
 
 EXTRA_DIST = examples interfaces test doc
 
 
+
+doxyfile.stamp:
+	@echo "Generating documentation using doxygen..."
+	cd doc ; doxygen Doxyfile.in >& doxygen.log ; echo Timestamp > ../doxyfile.stamp
+
+CLEANFILES = doxyfile.stamp
+
+doc: doxyfile.stamp
+clean-local:
+	rm -rf ./doc/latex
+	rm -rf ./doc/html
+	rm -f doxyfile.stamp
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 2d81fd1..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-if HAVE_DOXYGEN
-
-doxyfile.stamp:
-	@echo "Generating documentation using doxygen..."
-	doxygen Doxyfile.in >& doxygen.log
-	echo Timestamp > doxyfile.stamp
-
-CLEANFILES = doxyfile.stamp
-
-all: doxyfile.stamp
-clean:
-	rm -rf ./latex
-	rm -rf ./html
-	rm -f doxyfile.stamp
-endif