diff -r 2523d03a840e -r fda83d91e600 librazor/Makefile.am
--- a/librazor/Makefile.am	Wed Apr 29 17:00:01 2009 +0100
+++ b/librazor/Makefile.am	Fri Jul 03 19:06:29 2009 +0100
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = types
+
 INCLUDES = \
 	-I$(top_builddir)/gl -I$(top_srcdir)/gl \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
@@ -12,9 +14,8 @@
 	-DPACKAGE_LIB_DIR=\""$(libdir)"\"
 
 lib_LTLIBRARIES = librazor.la
-check_PROGRAMS = test-hashtable
 if HAVE_LUA
-  check_PROGRAMS += test-lua
+  check_PROGRAMS = test-lua
 endif
 
 librazorincludedir = $(includedir)/razor
@@ -27,7 +28,6 @@
 	razor.h						\
 	razor.c						\
 	root.c						\
-	types.c						\
 	util.c						\
 	rpm.c						\
 	iterator.c					\
@@ -39,20 +39,16 @@
   librazor_la_SOURCES += lua.c
 endif
 
-librazor_la_LIBADD = $(ZLIB_LIBS) $(LUA_LIBS) ../gl/libgnu.la $(EXTRA_LIBS)
+librazor_la_LIBADD = $(ZLIB_LIBS) types/libtypes.la $(LUA_LIBS) \
+	../gl/libgnu.la $(EXTRA_LIBS)
 librazor_la_LDFLAGS = -no-undefined
 
-test_hashtable_SOURCES = test-hashtable.c
-test_hashtable_LDADD = types.lo ../gl/libgnu.la $(EXTRA_LIBS)
-
-TESTS = test-hashtable
-
 if HAVE_LUA
   test_lua_SOURCES = test-lua.c
-  test_lua_LDADD = lua.lo util.lo types.lo $(LUA_LIBS) ../gl/libgnu.la \
-	$(EXTRA_LIBS)
+  test_lua_LDADD = lua.lo util.lo types/libtypes.la $(LUA_LIBS) \
+	../gl/libgnu.la $(EXTRA_LIBS)
 
-  TESTS += test-lua
+  TESTS = test-lua
 endif
 
 EXTRA_DIST = 			\