From 547d6a4a8ed5ac2e8d922c0c7cfb294e0a3ceed4 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 23 Oct 2018 11:53:50 +0200 Subject: Fix link errors --- lib/bookmarks/meson.build | 6 +----- lib/configuration/meson.build | 10 +++++++--- lib/urlfilter/meson.build | 21 +++++++++++---------- lib/web/meson.build | 7 +++---- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/bookmarks/meson.build b/lib/bookmarks/meson.build index faaa154..73a52aa 100644 --- a/lib/bookmarks/meson.build +++ b/lib/bookmarks/meson.build @@ -15,9 +15,5 @@ bookmarks_lib = static_library('bookmarks', dep_bookmarks = declare_dependency( include_directories: bookmarks_inc, - link_with: bookmarks_lib, - sources: ['bookmarkswidget.cpp', bookmarks_moc, - 'xbel.cpp', 'xbel.h', - 'model/bookmarkitem.cpp', 'model/bookmarkmodel.cpp', - 'forms/editbookmarkdialog.cpp'] + link_with: bookmarks_lib ) diff --git a/lib/configuration/meson.build b/lib/configuration/meson.build index ea78f8d..b166d5e 100644 --- a/lib/configuration/meson.build +++ b/lib/configuration/meson.build @@ -1,11 +1,15 @@ configuration_inc = include_directories('.') -configuration_lib = static_library('configuration', ['configuration.cpp', 'configuration.h'], +configuration_moc = qt5.preprocess( + moc_headers: ['configuration.h'], + dependencies: dep_qt5 +) + +configuration_lib = static_library('configuration', ['configuration.cpp', configuration_moc], dependencies: [dep_boost, dep_qt5], include_directories: genheader_inc ) dep_configuration = declare_dependency( include_directories: configuration_inc, - link_with: configuration_lib, - sources: ['configuration.cpp', 'configuration.h'] + link_with: configuration_lib ) diff --git a/lib/urlfilter/meson.build b/lib/urlfilter/meson.build index 9178d1c..732b67f 100644 --- a/lib/urlfilter/meson.build +++ b/lib/urlfilter/meson.build @@ -1,17 +1,18 @@ urlfilter_inc = include_directories('.') -urlfilter_lib = static_library('urlfilter', - ['filtertree.cpp', 'filtertree.h', 'filterleaf.cpp', 'filterleaf.h', - 'domain.cpp', 'domain.h', - 'formats/adblockrule.cpp', 'formats/adblockrule.h', - 'formats/hostlistrule.cpp', 'formats/hostlistrule.h'], + +urlfilter_moc = qt5.preprocess( + moc_headers: ['filtertree.h', 'filterleaf.h', 'formats/adblockrule.h', 'formats/hostlistrule.h'], + dependencies: dep_qt5 +) + +urlfilter_lib = static_library('urlfilter', + ['filtertree.cpp', 'filterleaf.cpp', urlfilter_moc, + 'domain.cpp', 'domain.h', + 'formats/adblockrule.cpp', 'formats/hostlistrule.cpp', ], dependencies: dep_qt5 ) dep_urlfilter = declare_dependency( include_directories: urlfilter_inc, - link_with: urlfilter_lib, - sources: ['filtertree.cpp', 'filtertree.h', 'filterleaf.cpp', 'filterleaf.h', - 'domain.cpp', 'domain.h', - 'formats/adblockrule.cpp', 'formats/adblockrule.h', - 'formats/hostlistrule.cpp', 'formats/hostlistrule.h'] + link_with: urlfilter_lib ) diff --git a/lib/web/meson.build b/lib/web/meson.build index 55534d3..54d94df 100644 --- a/lib/web/meson.build +++ b/lib/web/meson.build @@ -4,13 +4,12 @@ web_moc = qt5.preprocess( dependencies: dep_qt5 ) web_lib = static_library('web', - ['profilemanager.cpp', 'webprofile.cpp', web_moc], + ['profilemanager.cpp', 'webprofile.cpp', web_moc, interfaces_moc], dependencies: dep_qt5, - include_directories: include + include_directories: [include, web_inc] ) dep_web = declare_dependency( include_directories: web_inc, - link_with: web_lib, - sources: ['profilemanager.cpp', 'webprofile.cpp', web_moc] + link_with: web_lib ) -- cgit v1.2.1