added check for automake version, which must be version 1.9 or newer, otherwise the...

added doxygen rule
added maintainer clean rule

diff --git a/Makefile.am b/Makefile.am
index b008944..6ea48bf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,11 @@
-AUTOMAKE_OPTIONS = foreign
+##AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src 
 
-##EXTRA_DIST= m4/yazpp.m4 m4/yaz.m4  buildconf.sh
+EXTRA_DIST= m4/yazpp.m4 m4/yaz.m4  buildconf.sh
+
+MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure 
+
+# doxygen target
+dox:
+       doxygen

diff --git a/configure.ac b/configure.ac
index 50e8a78..ab22318 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 ## -*- Autoconf -*-
 ## Process this file with autoconf to produce a configure script.
 
+# Autoconf and automake setup
 AC_PREREQ(2.57)
 AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
 AM_CONFIG_HEADER(src/config.hpp)
@@ -113,5 +114,21 @@ Configuration:
   Linked libs:                ${LIBS}
   Host System Type:           ${host}
   Install path:               ${prefix}
+  Automake:                   ${AUTOMAKE}
 
 ------------------------------------------------------------------------"
+
+automake --version| grep 1.4  > /dev/null ||  \
+automake --version| grep 1.5  > /dev/null ||  \
+automake --version| grep 1.6  > /dev/null ||  \
+automake --version| grep 1.7  > /dev/null ||  \ 
+automake --version| grep 1.8  > /dev/null     \ 
+&& echo \
+"  YOUR AUTOMAKE IS TOO OLD - USE VERSION 1.9 OR NEWER
+
+  On a Debian system run
+
+  sudo apt-get install automake1.9
+  sudo update-alternatives --config automake
+
+"
\ No newline at end of file

diff --git a/src/Makefile.am b/src/Makefile.am
index 269edad..23198ab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,7 @@
-## $Id: Makefile.am,v 1.9 2005-10-07 13:56:02 adam Exp $
+## $Id: Makefile.am,v 1.10 2005-10-07 21:38:24 marc Exp $
+
+MAINTAINERCLEANFILES    = Makefile.in config.in config.hpp
+
 
 AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
@@ -31,3 +34,9 @@ LDADD= $(YAZPPLALIB) $(XSLT_LIBS)
 test_filter1_LDADD = $(LDADD) -lboost_unit_test_framework
 test_boost_threads_LDADD = $(LDADD) -lboost_unit_test_framework
 
+
+
+
+# doxygen target
+dox:
+       (cd $(top_srcdir) ; make dox)