From: Davide Cavalca <davide125@tiscali.it>
Date: Wed, 14 Feb 2018 13:08:50 +0000 (-0800)
Subject: meson: factor out daemon/event/id128 sources into variables (#8170)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=04fa10265f18424ca0ed2f6d2c8ce98196b4a291;p=elogind.git

meson: factor out daemon/event/id128 sources into variables (#8170)
---

diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build
index 69424a054..cc46f04d9 100644
--- a/src/libelogind/meson.build
+++ b/src/libelogind/meson.build
@@ -15,6 +15,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with elogind; If not, see <http://www.gnu.org/licenses/>.
 
+id128_sources = files('''
+        sd-id128/id128-util.c
+        sd-id128/id128-util.h
+        sd-id128/sd-id128.c
+'''.split())
+
+sd_daemon_c = files('sd-daemon/sd-daemon.c')
+sd_event_c = files('sd-event/sd-event.c')
 sd_login_c = files('sd-login/sd-login.c')
 
 #if 0 /// elogind has a shorter list, of course...
@@ -58,7 +66,6 @@ sd_login_c = files('sd-login/sd-login.c')
 #         sd-bus/bus-type.c
 #         sd-bus/bus-type.h
 #         sd-bus/sd-bus.c
-#         sd-daemon/sd-daemon.c
 #         sd-device/device-enumerator-private.h
 #         sd-device/device-enumerator.c
 #         sd-device/device-internal.h
@@ -66,13 +73,9 @@ sd_login_c = files('sd-login/sd-login.c')
 #         sd-device/device-private.h
 #         sd-device/device-util.h
 #         sd-device/sd-device.c
-#         sd-event/sd-event.c
 #         sd-hwdb/hwdb-internal.h
 #         sd-hwdb/hwdb-util.h
 #         sd-hwdb/sd-hwdb.c
-#         sd-id128/id128-util.c
-#         sd-id128/id128-util.h
-#         sd-id128/sd-id128.c
 #         sd-netlink/generic-netlink.c
 #         sd-netlink/local-addresses.c
 #         sd-netlink/local-addresses.h
@@ -91,7 +94,7 @@ sd_login_c = files('sd-login/sd-login.c')
 #         sd-path/sd-path.c
 #         sd-resolve/sd-resolve.c
 #         sd-utf8/sd-utf8.c
-# '''.split()) + sd_login_c
+# '''.split()) + id128_sources + sd_daemon_c + sd_event_c + sd_login_c
 #else
 libelogind_internal_sources = files('''
         sd-bus/bus-bloom.c
@@ -151,15 +154,15 @@ libelogind_static = static_library(
 #         dependencies : [threads,
 #                         librt],
 #         c_args : ['-fvisibility=default'])
+# 
+# libsystemd_sym = 'src/libsystemd/libsystemd.sym'
+# 
+# libsystemd_pc = configure_file(
+#         input : 'libsystemd.pc.in',
+#         output : 'libsystemd.pc',
+# install_data(libsystemd_pc,
 #else
         dependencies : [threads])
 #endif // 0
-
-libelogind_sym = 'src/libelogind/libelogind.sym'
-
-libelogind_pc = configure_file(
-        input : 'libelogind.pc.in',
-        output : 'libelogind.pc',
         configuration : substs)
-install_data(libelogind_pc,
              install_dir : pkgconfiglibdir)