19 files changed, 14 insertions, 21 deletions
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index ec38b7a..35e8078 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,21 +1,14 @@
-libutil_a_SOURCES = include/util/util.h include/util/str_table.h
-libutil_a_SOURCES += include/util/hash_table.h include/util/test.h
-libutil_a_SOURCES += lib/util/str_table.c lib/util/alloc.c
-libutil_a_SOURCES += lib/util/rbtree.c include/util/rbtree.h
-libutil_a_SOURCES += lib/util/array.c include/util/array.h
-libutil_a_SOURCES += lib/util/xxhash.c lib/util/hash_table.c
-libutil_a_SOURCES += lib/util/fast_urem_by_const.h
-libutil_a_SOURCES += include/util/threadpool.h
-libutil_a_SOURCES += include/util/w32threadwrap.h
-libutil_a_SOURCES += lib/util/threadpool_serial.c
-libutil_a_SOURCES += lib/util/is_memory_zero.c
-libutil_a_SOURCES += lib/util/mkdir_p.c
-libutil_a_SOURCES += lib/util/canonicalize_name.c
-libutil_a_SOURCES += lib/util/filename_sane.c
-libutil_a_SOURCES += lib/util/source_date_epoch.c
-libutil_a_SOURCES += lib/util/file_cmp.c
-libutil_a_SOURCES += lib/util/hex_decode.c
-libutil_a_SOURCES += lib/util/base64_decode.c
+libutil_a_SOURCES = include/util/util.h include/util/str_table.h \
+	include/util/hash_table.h include/util/test.h include/util/rbtree.h \
+	include/util/array.h include/util/threadpool.h \
+	include/util/w32threadwrap.h include/util/mempool.h \
+	lib/util/src/str_table.c lib/util/src/alloc.c lib/util/src/rbtree.c \
+	lib/util/src/array.c lib/util/src/xxhash.c lib/util/src/hash_table.c \
+	lib/util/src/fast_urem_by_const.h lib/util/src/threadpool_serial.c \
+	lib/util/src/is_memory_zero.c lib/util/src/mkdir_p.c \
+	lib/util/src/canonicalize_name.c lib/util/src/filename_sane.c \
+	lib/util/src/source_date_epoch.c lib/util/src/file_cmp.c \
+	lib/util/src/hex_decode.c lib/util/src/base64_decode.c
 libutil_a_CFLAGS = $(AM_CFLAGS)
 libutil_a_CPPFLAGS = $(AM_CPPFLAGS)
 
@@ -24,18 +17,18 @@ libutil_a_CFLAGS += -DWINVER=0x0600 -D_WIN32_WINNT=0x0600
 endif
 
 if HAVE_PTHREAD
-libutil_a_SOURCES += lib/util/threadpool.c
+libutil_a_SOURCES += lib/util/src/threadpool.c
 libutil_a_CFLAGS += $(PTHREAD_CFLAGS)
 else
 if WINDOWS
-libutil_a_SOURCES += lib/util/threadpool.c
+libutil_a_SOURCES += lib/util/src/threadpool.c
 else
 libutil_a_CPPFLAGS += -DNO_THREAD_IMPL
 endif
 endif
 
 if CUSTOM_ALLOC
-libutil_a_SOURCES += lib/util/mempool.c include/util/mempool.h
+libutil_a_SOURCES += lib/util/src/mempool.c
 endif
 
 noinst_LIBRARIES += libutil.a
diff --git a/lib/util/alloc.c b/lib/util/src/alloc.c
index 359fef5..359fef5 100644
--- a/lib/util/alloc.c
+++ b/lib/util/src/alloc.c
diff --git a/lib/util/array.c b/lib/util/src/array.c
index 40bac50..40bac50 100644
--- a/lib/util/array.c
+++ b/lib/util/src/array.c
diff --git a/lib/util/base64_decode.c b/lib/util/src/base64_decode.c
index b1cf5b6..b1cf5b6 100644
--- a/lib/util/base64_decode.c
+++ b/lib/util/src/base64_decode.c
diff --git a/lib/util/canonicalize_name.c b/lib/util/src/canonicalize_name.c
index 534e89e..534e89e 100644
--- a/lib/util/canonicalize_name.c
+++ b/lib/util/src/canonicalize_name.c
diff --git a/lib/util/fast_urem_by_const.h b/lib/util/src/fast_urem_by_const.h
index 4fb78d3..4fb78d3 100644
--- a/lib/util/fast_urem_by_const.h
+++ b/lib/util/src/fast_urem_by_const.h
diff --git a/lib/util/file_cmp.c b/lib/util/src/file_cmp.c
index 2aa0cc2..2aa0cc2 100644
--- a/lib/util/file_cmp.c
+++ b/lib/util/src/file_cmp.c
diff --git a/lib/util/filename_sane.c b/lib/util/src/filename_sane.c
index b52ce4d..b52ce4d 100644
--- a/lib/util/filename_sane.c
+++ b/lib/util/src/filename_sane.c
diff --git a/lib/util/hash_table.c b/lib/util/src/hash_table.c
index 0010e9f..0010e9f 100644
--- a/lib/util/hash_table.c
+++ b/lib/util/src/hash_table.c
diff --git a/lib/util/hex_decode.c b/lib/util/src/hex_decode.c
index ee4b21c..ee4b21c 100644
--- a/lib/util/hex_decode.c
+++ b/lib/util/src/hex_decode.c
diff --git a/lib/util/is_memory_zero.c b/lib/util/src/is_memory_zero.c
index aabd45d..aabd45d 100644
--- a/lib/util/is_memory_zero.c
+++ b/lib/util/src/is_memory_zero.c
diff --git a/lib/util/mempool.c b/lib/util/src/mempool.c
index e2ddaf0..e2ddaf0 100644
--- a/lib/util/mempool.c
+++ b/lib/util/src/mempool.c
diff --git a/lib/util/mkdir_p.c b/lib/util/src/mkdir_p.c
index 993d8ec..993d8ec 100644
--- a/lib/util/mkdir_p.c
+++ b/lib/util/src/mkdir_p.c
diff --git a/lib/util/rbtree.c b/lib/util/src/rbtree.c
index 8b43e43..8b43e43 100644
--- a/lib/util/rbtree.c
+++ b/lib/util/src/rbtree.c
diff --git a/lib/util/source_date_epoch.c b/lib/util/src/source_date_epoch.c
index 26e5530..26e5530 100644
--- a/lib/util/source_date_epoch.c
+++ b/lib/util/src/source_date_epoch.c
diff --git a/lib/util/str_table.c b/lib/util/src/str_table.c
index 2d3e354..2d3e354 100644
--- a/lib/util/str_table.c
+++ b/lib/util/src/str_table.c
diff --git a/lib/util/threadpool.c b/lib/util/src/threadpool.c
index c7357cd..c7357cd 100644
--- a/lib/util/threadpool.c
+++ b/lib/util/src/threadpool.c
diff --git a/lib/util/threadpool_serial.c b/lib/util/src/threadpool_serial.c
index fb24ee8..fb24ee8 100644
--- a/lib/util/threadpool_serial.c
+++ b/lib/util/src/threadpool_serial.c
diff --git a/lib/util/xxhash.c b/lib/util/src/xxhash.c
index 60467fb..60467fb 100644
--- a/lib/util/xxhash.c
+++ b/lib/util/src/xxhash.c