3 files changed, 8 insertions, 33 deletions
diff --git a/doc/documentation.doxygen.in b/doc/Doxyfile
index 6e4d48c..e079aac 100644
--- a/doc/documentation.doxygen.in
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = LibXtract
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = @PACKAGE_VERSION@
+PROJECT_NUMBER         = 
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -477,8 +477,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/xtract
-#INPUT                  = 
+INPUT                  = ../include/xtract
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..048d758
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,6 @@
+
+all:
+	@$(shell (cat Doxyfile; echo "PROJECT_NUMBER=$(XTRACT_VERSION)") | doxygen - )
+
+clean:
+	@$(RM) -r latex html
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 560a006..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES=Makefile.in config.log
-if HAVE_DOXYGEN
-CLEANFILES=doxygen-build.stamp
-
-DOX=documentation.doxygen
-
-INSTIMAGES=html/doxygen.png
-
-DOC_STAMPS=html-build.stamp
-
-DOC_DIR=$(HTML_DIR)
-
-all-local: doxygen-build.stamp
-
-doxygen-build.stamp: $(DOX) ../xtract/libxtract.h ../xtract/xtract_scalar.h ../xtract/xtract_vector.h
-		@echo '*** Running doxygen ***'
-		doxygen $(DOX)
-		touch doxygen-build.stamp
-
-clean-local:
-		rm -f *~ *.bak $(DOC_STAMPS) || true
-		if test -d html; then rm -fr html; fi
-		if test -d latex; then rm -fr latex; fi
-		if test -d man; then rm -fr man; fi
-
-distclean-local: clean
-		rm -f *.stamp || true
-		if test -d html; then rm -rf html; fi
-
-endif