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

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

diff --git a/src/basic/meson.build b/src/basic/meson.build
index cf0038b832b035e2e561889d13c7bffb77f52d88..27d6ace453a984840fe31446160eb2a3a7d4e380 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -1,19 +1,4 @@
 # 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 shorter list
 # basic_sources = files('''
@@ -91,6 +76,8 @@
 #         fileio-label.h
 #         fileio.c
 #         fileio.h
+#         format-table.c
+#         format-table.h
 #         format-util.h
 #         fs-util.c
 #         fs-util.h
@@ -141,6 +128,10 @@
 #         nss-util.h
 #         ordered-set.c
 #         ordered-set.h
+#         pager.c
+#         pager.h
+#         os-util.c
+#         os-util.h
 #         parse-util.c
 #         parse-util.h
 #         path-util.c
@@ -159,6 +150,8 @@
 #         ratelimit.h
 #         raw-clone.h
 #         raw-reboot.h
+#         reboot-util.c
+#         reboot-util.h
 #         refcnt.h
 #         replace-var.c
 #         replace-var.h
@@ -171,7 +164,6 @@
 #         securebits.h
 #         selinux-util.c
 #         selinux-util.h
-#         set.c
 #         set.h
 #         sigbus.c
 #         sigbus.h
@@ -231,7 +223,7 @@
 #         xml.h
 # '''.split())
 #else
-basic_sources_plain = files('''
+basic_sources = files('''
         alloc-util.c
         alloc-util.h
         audit-util.c
@@ -305,6 +297,8 @@ basic_sources_plain = files('''
         mkdir-label.c
         mount-util.c
         mount-util.h
+        pager.c
+        pager.h
         parse-printf-format.c
         parse-printf-format.h
         parse-util.c
@@ -315,6 +309,8 @@ basic_sources_plain = files('''
         prioq.h
         proc-cmdline.c
         proc-cmdline.h
+        procfs-util.c
+        procfs-util.h
         process-util.c
         process-util.h
         random-util.c
@@ -324,7 +320,6 @@ basic_sources_plain = files('''
         rm-rf.h
         selinux-util.c
         selinux-util.h
-        set.c
         set.h
         sigbus.c
         sigbus.h
@@ -337,6 +332,7 @@ basic_sources_plain = files('''
         socket-util.c
         socket-util.h
         sparse-endian.h
+        special.h
         stat-util.c
         stat-util.h
         stdio-util.h
@@ -464,6 +460,11 @@ foreach item : [['cap',    cap_list_txt,    'capability', ''],
 endforeach
 
 basic_sources += [missing_h] + generated_gperf_headers
+#if 0 /// elogind does not need gcrypt
+# basic_gcrypt_sources = files(
+#         'gcrypt-util.c',
+#         'gcrypt-util.h')
+#endif // 0
 
 libbasic = static_library(
         'basic',
@@ -471,20 +472,21 @@ libbasic = static_library(
         include_directories : includes,
         dependencies : [threads,
                         libcap,
-#if 0 /// no blkid in elogind
+#if 0 /// Neither blkid nor libmount in elogind
 #                         libblkid,
+#                         libmount,
 #endif // 0
-                        libmount,
                         libselinux],
         c_args : ['-fvisibility=default'],
         install : false)
 
-# A convenience library that is separate from libbasic to avoid
-# unnecessary linking to libgcrypt.
-libbasic_gcrypt = static_library(
-        'basic-gcrypt',
-        'gcrypt-util.c',
-        'gcrypt-util.h',
-        include_directories : includes,
-        dependencies : [libgcrypt],
-        c_args : ['-fvisibility=default'])
+#if 0 /// elogind does not need gcrypt
+# # A convenience library that is separate from libbasic to avoid
+# # unnecessary linking to libgcrypt.
+# libbasic_gcrypt = static_library(
+#         'basic-gcrypt',
+#         basic_gcrypt_sources,
+#         include_directories : includes,
+#         dependencies : [libgcrypt],
+#         c_args : ['-fvisibility=default'])
+#endif // 0