diff --git a/makefile.am b/makefile.am
index c1182d1..19914f0 100644
--- a/makefile.am
+++ b/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.15  2004/12/17 16:30:06  marc
+## added tokenizer
+##
 ## Revision 1.14  2004/12/14 20:22:42  marc
 ## added regexp
 ##
@@ -60,7 +63,7 @@ nobase_include_HEADERS = mrw/arg.hpp        mrw/list.hpp \
 			 mrw/stacktrace.hpp \
                          mrw/exception.hpp  mrw/multiset.hpp  mrw/stdext.hpp \
                          mrw/exec.hpp       mrw/set.hpp       mrw/string.hpp \
-			 mrw/regexp.hpp
+			 mrw/regexp.hpp     mrw/tokenizer.hpp
 infosdir = ${pkgdatadir}
 infos_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog \
              @PACKAGENAME@.spec
diff --git a/mrw/makefile.am b/mrw/makefile.am
index 7735bec..c07d96a 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.16  2004/12/17 16:30:06  marc
+## added tokenizer
+##
 ## Revision 1.15  2004/12/14 20:20:06  marc
 ## added regexp
 ##
@@ -85,7 +88,8 @@ endif
 #                    map.hpp multimap.hpp multiset.hpp \
 #                    set.hpp simpletrace.hpp \
 #                    smartpointer.hpp stdext.cpp stdext.hpp \
-#                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp
+#                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
+#                    tokenizer.hpp
 #else
   libmrw_la_SOURCES = \
                     mrw.hpp version.cpp \
@@ -95,7 +99,8 @@ endif
                     map.hpp multimap.hpp multiset.hpp \
                     set.hpp simpletrace.hpp \
                     smartpointer.hpp stdext.cpp stdext.hpp \
-                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp
+                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
+		    tokenizer.hpp
 #endif
 if HAVE_STACKTRACE
 #if TRACER
@@ -125,7 +130,8 @@ if HAVE_LOG4CXX
 endif
 endif
 
-check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test
+check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test \
+                 tokenizer_test
 if HAVE_STACKTRACE
   check_PROGRAMS += stacktrace_test mrwexcstderr_test
 if HAVE_LOG4CXX
@@ -162,6 +168,12 @@ regexp_test_LDADD = -lmrw -lcppunit
 if HAVE_STACKTRACE
  regexp_test_LDADD += -lmrwexcstderr
 endif
+tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp
+tokenizer_test_CPPFLAGS = -I.. -g3
+tokenizer_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ tokenizer_test_LDADD += -lmrwexcstderr
+endif
 if HAVE_STACKTRACE
   stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
   stacktrace_test_CPPFLAGS = -I.. -g3