From 1062bd73a38f6b0aac7503fa81ce9aabcff7948a Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 11 Sep 2022 16:05:25 +0200 Subject: [PATCH] It's libkiwix, not kiwixlib --- src/meson.build | 2 +- src/opds_dumper.cpp | 2 +- src/search_renderer.cpp | 2 +- src/server/internalServer.cpp | 2 +- src/server/internalServer_catalog_v2.cpp | 2 +- src/server/response.cpp | 2 +- static/meson.build | 2 +- test/meson.build | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/meson.build b/src/meson.build index db7593094..3c486fb18 100644 --- a/src/meson.build +++ b/src/meson.build @@ -45,7 +45,7 @@ config_h = configure_file(output : 'kiwix_config.h', input : 'config.h.in') install_headers(config_h, subdir:'kiwix') -kiwixlib = library('kiwix', +libkiwix = library('kiwix', kiwix_sources, include_directories : inc, dependencies : all_deps, diff --git a/src/opds_dumper.cpp b/src/opds_dumper.cpp index 6255087ea..13c9804aa 100644 --- a/src/opds_dumper.cpp +++ b/src/opds_dumper.cpp @@ -20,7 +20,7 @@ #include "opds_dumper.h" #include "book.h" -#include "kiwixlib-resources.h" +#include "libkiwix-resources.h" #include #include "tools/stringTools.h" diff --git a/src/search_renderer.cpp b/src/search_renderer.cpp index 5f1d5b675..8da95baa0 100644 --- a/src/search_renderer.cpp +++ b/src/search_renderer.cpp @@ -29,7 +29,7 @@ #include #include -#include "kiwixlib-resources.h" +#include "libkiwix-resources.h" #include "tools/stringTools.h" namespace kiwix diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 43411260f..f194c9252 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -68,7 +68,7 @@ extern "C" { #include #include #include -#include "kiwixlib-resources.h" +#include "libkiwix-resources.h" #ifndef _WIN32 # include diff --git a/src/server/internalServer_catalog_v2.cpp b/src/server/internalServer_catalog_v2.cpp index 48d747ba0..bc7f1adae 100644 --- a/src/server/internalServer_catalog_v2.cpp +++ b/src/server/internalServer_catalog_v2.cpp @@ -24,7 +24,7 @@ #include "request_context.h" #include "response.h" #include "tools/otherTools.h" -#include "kiwixlib-resources.h" +#include "libkiwix-resources.h" #include diff --git a/src/server/response.cpp b/src/server/response.cpp index 746a494ad..4b53914c2 100644 --- a/src/server/response.cpp +++ b/src/server/response.cpp @@ -20,7 +20,7 @@ #include "response.h" #include "request_context.h" #include "internalServer.h" -#include "kiwixlib-resources.h" +#include "libkiwix-resources.h" #include "tools/regexTools.h" #include "tools/stringTools.h" diff --git a/static/meson.build b/static/meson.build index fb7ad0483..1bed7ebe1 100644 --- a/static/meson.build +++ b/static/meson.build @@ -15,7 +15,7 @@ preprocessed_resources = custom_target('preprocessed_resource_files', lib_resources = custom_target('resources', input: preprocessed_resources, - output: ['kiwixlib-resources.cpp', 'kiwixlib-resources.h'], + output: ['libkiwix-resources.cpp', 'libkiwix-resources.h'], command:[res_compiler, '--cxxfile', '@OUTPUT0@', '--hfile', '@OUTPUT1@', diff --git a/test/meson.build b/test/meson.build index 3137163a7..b91f8cd0f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -69,7 +69,7 @@ if gtest_dep.found() and not meson.is_cross_build() test_exe = executable(test_name, [test_name+'.cpp'], implicit_include_directories: false, include_directories : inc, - link_with : kiwixlib, + link_with : libkiwix, link_args: extra_link_args, dependencies : all_deps + [gtest_dep], build_rpath : '$ORIGIN')