diff -r 51a084acef49 -r 008c75a5e08d librazor/Makefile.am
--- a/librazor/Makefile.am	Fri Oct 17 10:08:28 2014 +0100
+++ b/librazor/Makefile.am	Mon Jul 04 10:48:18 2016 +0100
@@ -14,7 +14,7 @@
 	-DPACKAGE_LIB_DIR=\""$(libdir)"\"
 
 lib_LTLIBRARIES = librazor.la
-check_PROGRAMS = test-pfu
+check_PROGRAMS = test-pfu test-uri
 if HAVE_LUA
   check_PROGRAMS += test-lua
 endif
@@ -30,11 +30,14 @@
 
 librazor_la_SOURCES =                                	\
 	razor-internal.h				\
+	uri.h						\
 	razor.h						\
 	razor.c						\
 	root.c						\
 	dump.c						\
 	util.c						\
+	uri-io.c					\
+	uri.c						\
 	path.c						\
 	rpm.c						\
 	iterator.c					\
@@ -58,15 +61,22 @@
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 test_pfu_SOURCES = test-pfu.c
-test_pfu_LDADD = path.lo util.lo error.lo types/libtypes.la \
+test_pfu_LDADD = path.lo uri.lo util.lo error.lo types/libtypes.la \
 	../gl/libgnu.la $(INTLLIBS) $(EXTRA_LIBS)
 
 TESTS = test-pfu
 
+test_uri_SOURCES = test-uri.c
+test_uri_CFLAGS = $(AM_CFLAGS)
+test_uri_LDADD = uri.lo util.lo path.lo error.lo types/libtypes.la \
+	$(LUA_LIBS) ../gl/libgnu.la $(INTLLIBS) $(EXTRA_LIBS)
+
+TESTS += test-uri
+
 if HAVE_LUA
   test_lua_SOURCES = test-lua.c
-  test_lua_LDADD = lua.lo util.lo error.lo types/libtypes.la $(LUA_LIBS) \
-	../gl/libgnu.la $(INTLLIBS) $(EXTRA_LIBS)
+  test_lua_LDADD = lua.lo uri.lo uri-io.lo util.lo path.lo error.lo \
+  	types/libtypes.la $(LUA_LIBS) ../gl/libgnu.la $(INTLLIBS) $(EXTRA_LIBS)
 
   TESTS += test-lua
 endif