1 files changed, 19 insertions, 12 deletions
diff --git a/lib/urlfilter/meson.build b/lib/urlfilter/meson.build
index 1f4f47c..b017eb5 100644
--- a/lib/urlfilter/meson.build
+++ b/lib/urlfilter/meson.build
@@ -1,19 +1,26 @@
-urlfilter_inc = include_directories('.')
-
-urlfilter_moc = qt5.preprocess(
-    moc_headers: 'filtertree.h',
-    dependencies: dep_qt5
-)
-
 urlfilter_lib = static_library('urlfilter',
-    ['filtertree.cpp', 'filterleaf.cpp', urlfilter_moc,
-    'domain.cpp', 'domain.h',
-    'formats/adblockrule.cpp', 'formats/adblockrule_parse.cpp', 'formats/hostlistrule.cpp', 
-    'formats/adblocklist.cpp'],
+    ['urlfilter.h', 'matcher.h',
+    'hostlist/hostlist.cpp', 'hostlist/hostlist.h',
+    'adblock/adblocklist.cpp', 'adblock/adblocklist.h', 'adblock/parser.cpp', 'adblock/parser.h'],
     dependencies: dep_qt5
 )
 
 dep_urlfilter = declare_dependency(
-    include_directories: urlfilter_inc,
+    include_directories: include_directories('.'),
     link_with: urlfilter_lib
 )
+
+if get_option('testing').enabled()
+    test('urlfilter: matcher',
+        executable('urlfilter-matcher', dependencies: [dep_qt5, dep_gtest, dep_urlfilter], sources: ['test/matcher.cpp']),
+        workdir: meson.current_source_dir() / 'test'
+    )
+    test('urlfilter: host list',
+        executable('urlfilter-hostlist', dependencies: [dep_qt5, dep_gtest, dep_urlfilter], sources: ['test/hostlist.cpp']),
+        workdir: meson.current_source_dir() / 'test'
+    )
+    test('urlfilter: adblock list',
+        executable('urlfilter-adblocklist', dependencies: [dep_qt5, dep_gtest, dep_urlfilter], sources: ['test/adblock.cpp']),
+        workdir: meson.current_source_dir() / 'test'
+    )
+endif