Prep v239: Mirror upstream and move pager.[hc] from shared to basic.

[elogind.git] / src / shared / meson.build

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 89f11a51cbd76cd1038ba65e2a8853c63c1431fa..760f9a123dc27de75f4ecb99ab0b730987852161 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -1,22 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright 2017 Zbigniew Jędrzejewski-Szmek
-#
-# elogind is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# elogind is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
 #if 0 /// elogind has a much shorter list
-# shared_sources = '''
+# shared_sources = files('''
 #         acl-util.h
 #         acpi-fpdt.c
 #         acpi-fpdt.h
@@ -83,8 +68,6 @@
 #         nsflags.h
 #         output-mode.c
 #         output-mode.h
-#         pager.c
-#         pager.h
 #         path-lookup.c
 #         path-lookup.h
 #         ptyfwd.c
@@ -119,7 +102,8 @@
 #         volatile-util.h
 #         watchdog.c
 #         watchdog.h
-# '''.split()
+#         wireguard-netlink.h
+# '''.split())
 #else
 shared_sources = '''
         bus-util.c
@@ -134,8 +118,6 @@ shared_sources = '''
         nsflags.h
         output-mode.c
         output-mode.h
-        pager.c
-        pager.h
         sleep-config.c
         sleep-config.h
         spawn-polkit-agent.c
@@ -149,20 +131,20 @@ test_tables_h = files('test-tables.h')
 shared_sources += [test_tables_h]
 
 if conf.get('HAVE_ACL') == 1
-        shared_sources += ['acl-util.c']
+        shared_sources += files('acl-util.c')
 endif
 
 if conf.get('ENABLE_UTMP') == 1
-        shared_sources += ['utmp-wtmp.c']
+        shared_sources += files('utmp-wtmp.c')
 endif
 
 #if 0 /// UNNEEDED by elogind
 # if conf.get('HAVE_SECCOMP') == 1
-#         shared_sources += ['seccomp-util.c']
+#         shared_sources += files('seccomp-util.c')
 # endif
 # 
 # if conf.get('HAVE_LIBIPTC') == 1
-#         shared_sources += ['firewall-util.c']
+#         shared_sources += files('firewall-util.c')
 # endif
 #endif // 0
 
@@ -201,22 +183,21 @@ libshared_static = static_library(
 libshared = shared_library(
         libshared_name,
 #if 0 /// UNNEEDED by elogind
-#         journal_internal_sources,
 #         libudev_sources,
-#         include_directories : includes,
-#         link_args : ['-shared',
-#                      '-Wl,--version-script=' + libshared_sym_path],
-#         link_whole : [libshared_static,
-#                       libbasic,
+#endif // 0
+        include_directories : includes,
+        link_args : ['-shared',
+                     '-Wl,--version-script=' + libshared_sym_path],
+        link_whole : [libshared_static,
+                      libbasic,
+#if 0 /// UNNEEDED by elogind
 #                       libbasic_gcrypt,
-#                       libsystemd_static],
+#                       libsystemd_static,
+#                       libjournal_client],
 #else
-        libelogind_internal_sources,
+                      libelogind_static],
 #endif // 0
         c_args : ['-fvisibility=default'],
         dependencies : libshared_deps,
         install : true,
         install_dir : rootlibexecdir)
-#if 1 /// need elogind internal library sources
-        libelogind_internal_sources,
-#endif // 1