diff --git a/mrw/makefile.am b/mrw/makefile.am
index c21fe90..c894e6d 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -9,6 +9,12 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.9  2004/10/07 09:29:17  marc
+## new classes
+## new versioning
+## link tests with unexpected handler
+## check doxygen.error
+##
 ## Revision 1.8  2004/09/09 20:09:06  marc
 ## library versioning now works how i want it
 ##
@@ -56,24 +62,29 @@ libmrw_la_SOURCES = mrw.hpp \
                     auto.hpp unistd.hpp smartpointer.hpp \
 		    exception.hpp exception.cpp \
 		    exec.hpp exec.cpp \
-		    arg.hpp arg.cpp version.cpp
+		    arg.hpp arg.cpp \
+		    string.hpp \
+		    list.hpp vector.hpp deque.hpp \
+		    set.hpp map.hpp \
+		    multiset.hpp multimap.hpp \
+		    version.cpp
 if HAVE_STACKTRACE
   libmrw_la_SOURCES += stacktrace.hpp stacktrace.cpp
 endif
-libmrw_la_LDFLAGS = -version-info @LIB_MAJOR@:@LIB_MINOR@:@LIB_LEAST@
+libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
 if HAVE_STACKTRACE
   libmrwexcstderr_la_SOURCES = autostacktracestderr.cpp version.cpp
-  libmrwexcstderr_la_LDFLAGS = -version-info @LIB_MAJOR@:@LIB_MINOR@:@LIB_LEAST@
+  libmrwexcstderr_la_LDFLAGS = -version-info @LIB_VERSION@
   libmrwexcstderr_la_LIBADD = -lmrw
 
 if HAVE_LOG4CXX
     libmrwexclog4cxx_la_SOURCES = autostacktracelog4cxx.cpp version.cpp
-    libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_MAJOR@:@LIB_MINOR@:@LIB_LEAST@
+    libmrwexclog4cxx_la_LDFLAGS = -version-info @LIB_VERSION@
     libmrwexclog4cxx_la_LIBADD = -lmrw
 endif
 endif
 
-check_PROGRAMS = auto_test smartpointer_test exec_test
+check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test
 if HAVE_STACKTRACE
   check_PROGRAMS += stacktrace_test mrwexcstderr_test
 if HAVE_LOG4CXX
@@ -83,16 +94,31 @@ endif
 auto_test_SOURCES = auto_test.cpp version.cpp
 auto_test_CPPFLAGS = -I.. -g3
 auto_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ auto_test_LDADD += -lmrwexcstderr
+endif
 smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp
 smartpointer_test_CPPFLAGS = -I.. -g3
 smartpointer_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ smartpointer_test_LDADD += -lmrwexcstderr
+endif
 exec_test_SOURCES = exec_test.cpp version.cpp
 exec_test_CPPFLAGS = -I.. -g3
 exec_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ exec_test_LDADD += -lmrwexcstderr
+endif
+stdext_test_SOURCES = stdext_test.cpp version.cpp
+stdext_test_CPPFLAGS = -I.. -g3
+stdext_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ stdext_test_LDADD += -lmrwexcstderr
+endif
 if HAVE_STACKTRACE
   stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
   stacktrace_test_CPPFLAGS = -I.. -g3
-  stacktrace_test_LDADD = -lmrw -lcppunit
+  stacktrace_test_LDADD = -lmrw -lcppunit -lmrwexcstderr
   mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp
   mrwexcstderr_test_CPPFLAGS = -I.. -g3
   mrwexcstderr_test_LDADD = -lmrwexcstderr -lcppunit
@@ -110,9 +136,12 @@ deps = ../COPYING ../README ../INSTALL ../NEWS ../ChangeLog
 doc: doc/html/index.html doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 doc/html/index.html: doxyfile *.[ch]pp ${deps}
 	doxygen doxyfile
+if PEDANTIC
+	test \! -s doxygen.errors
+endif
 doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp ${deps}
 	cd doc/latex && make && \
-	mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
+	  mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 clean-local:
 	- rm doxygen.err libmrw.doxytag
 distclean-local: