Merge pull request #818 from kiwix/remove-last-kiwixlib

It's libkiwix, not kiwixlib

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,

src/opds_dumper.cpp

@@ -20,7 +20,7 @@
 #include "opds_dumper.h"
 #include "book.h"
 
-#include "kiwixlib-resources.h"
+#include "libkiwix-resources.h"
 #include <mustache.hpp>
 
 #include "tools/stringTools.h"

src/search_renderer.cpp

@@ -29,7 +29,7 @@
 #include <zim/search.h>
 
 #include <mustache.hpp>
-#include "kiwixlib-resources.h"
+#include "libkiwix-resources.h"
 #include "tools/stringTools.h"
 
 namespace kiwix

src/server/internalServer.cpp

@@ -68,7 +68,7 @@ extern "C" {
 #include <vector>
 #include <chrono>
 #include <fstream>
-#include "kiwixlib-resources.h"
+#include "libkiwix-resources.h"
 
 #ifndef _WIN32
 # include <arpa/inet.h>

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 <mustache.hpp>
 

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"

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@',

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')