1.1 --- a/librazor/Makefile.am	Wed Apr 29 17:00:01 2009 +0100
     1.2 +++ b/librazor/Makefile.am	Fri Jun 12 16:59:11 2009 +0100
     1.3 @@ -1,5 +1,7 @@
     1.4  ## Process this file with automake to produce Makefile.in
     1.5  
     1.6 +SUBDIRS = types
     1.7 +
     1.8  INCLUDES = \
     1.9  	-I$(top_builddir)/gl -I$(top_srcdir)/gl \
    1.10  	-I$(top_builddir)/src -I$(top_srcdir)/src \
    1.11 @@ -12,9 +14,8 @@
    1.12  	-DPACKAGE_LIB_DIR=\""$(libdir)"\"
    1.13  
    1.14  lib_LTLIBRARIES = librazor.la
    1.15 -check_PROGRAMS = test-hashtable
    1.16  if HAVE_LUA
    1.17 -  check_PROGRAMS += test-lua
    1.18 +  check_PROGRAMS = test-lua
    1.19  endif
    1.20  
    1.21  librazorincludedir = $(includedir)/razor
    1.22 @@ -27,7 +28,6 @@
    1.23  	razor.h						\
    1.24  	razor.c						\
    1.25  	root.c						\
    1.26 -	types.c						\
    1.27  	util.c						\
    1.28  	rpm.c						\
    1.29  	iterator.c					\
    1.30 @@ -39,20 +39,16 @@
    1.31    librazor_la_SOURCES += lua.c
    1.32  endif
    1.33  
    1.34 -librazor_la_LIBADD = $(ZLIB_LIBS) $(LUA_LIBS) ../gl/libgnu.la $(EXTRA_LIBS)
    1.35 +librazor_la_LIBADD = $(ZLIB_LIBS) types/libtypes.la $(LUA_LIBS) \
    1.36 +	../gl/libgnu.la $(EXTRA_LIBS)
    1.37  librazor_la_LDFLAGS = -no-undefined
    1.38  
    1.39 -test_hashtable_SOURCES = test-hashtable.c
    1.40 -test_hashtable_LDADD = types.lo ../gl/libgnu.la $(EXTRA_LIBS)
    1.41 -
    1.42 -TESTS = test-hashtable
    1.43 -
    1.44  if HAVE_LUA
    1.45    test_lua_SOURCES = test-lua.c
    1.46 -  test_lua_LDADD = lua.lo util.lo types.lo $(LUA_LIBS) ../gl/libgnu.la \
    1.47 -	$(EXTRA_LIBS)
    1.48 +  test_lua_LDADD = lua.lo util.lo types/libtypes.la $(LUA_LIBS) \
    1.49 +	../gl/libgnu.la $(EXTRA_LIBS)
    1.50  
    1.51 -  TESTS += test-lua
    1.52 +  TESTS = test-lua
    1.53  endif
    1.54  
    1.55  EXTRA_DIST = 			\