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 02cca79d731eff418f115b94c50f0c6d7c6e1991..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
@@ -173,7 +164,6 @@
 #         securebits.h
 #         selinux-util.c
 #         selinux-util.h
-#         set.c
 #         set.h
 #         sigbus.c
 #         sigbus.h
@@ -307,6 +297,8 @@ basic_sources = 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
@@ -328,7 +320,6 @@ basic_sources = files('''
         rm-rf.h
         selinux-util.c
         selinux-util.h
-        set.c
         set.h
         sigbus.c
         sigbus.h
@@ -389,7 +380,7 @@ generate_gperfs = find_program('generate-gperfs.py')
 #         output : 'af-list.txt',
 #         command : [generate_af_list, cpp],
 #         capture : true)
-#
+# 
 # generate_arphrd_list = find_program('generate-arphrd-list.sh')
 # arphrd_list_txt = custom_target(
 #         'arphrd-list.txt',
@@ -469,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',
@@ -476,7 +472,7 @@ 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
@@ -489,8 +485,7 @@ libbasic = static_library(
 # # unnecessary linking to libgcrypt.
 # libbasic_gcrypt = static_library(
 #         'basic-gcrypt',
-#         'gcrypt-util.c',
-#         'gcrypt-util.h',
+#         basic_gcrypt_sources,
 #         include_directories : includes,
 #         dependencies : [libgcrypt],
 #         c_args : ['-fvisibility=default'])