From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 19 Dec 2017 19:54:46 +0000 (+0100)
Subject: meson: rename libudev_internal to libudev_static and link into libudev
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=70f9a30a6058ba92d0b93da00727cf76c1592633;p=elogind.git

meson: rename libudev_internal to libudev_static and link into libudev

This reduces the meson man=false target count to 1281.

v2:
- link test-engine with libshared instead of libsystemd_static
Previous version built fine on F27, but fails on F26 with the following error:
/usr/bin/ld: /tmp/ccr8HRGw.ltrans6.ltrans.o: undefined reference to symbol '__start_BUS_ERROR_MAP@@SD_SHARED'
/home/zbyszek/fedora/systemd/systemd-9d5aae75c64f5583a110f03b94816aacc03bbf4d/x86_64-redhat-linux-gnu/src/shared/libsystemd-shared-236.so: error adding symbols: DSO missing from command line

v3:
- add libudev_basic
---

diff --git a/meson.build b/meson.build
index bbd4ed340..e8e82ec27 100644
--- a/meson.build
+++ b/meson.build
@@ -2500,7 +2500,7 @@ executable('elogind-cgroups-agent',
 #                          'src/hwdb/hwdb.c',
 #                          'src/libsystemd/sd-hwdb/hwdb-internal.h',
 #                          include_directories : includes,
-#                          link_with : [libudev_internal],
+#                          link_with : [libudev_static],
 #                          install_rpath : udev_rpath,
 #                          install : true,
 #                          install_dir : rootbindir)
@@ -2533,7 +2533,7 @@ executable('elogind-cgroups-agent',
 #                  c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
 #                  link_with : [libudev_core,
 #                               libsystemd_network,
-#                               libudev_internal],
+#                               libudev_static],
 #                  dependencies : [threads,
 #                                  libkmod,
 #                                  libidn,
@@ -2550,7 +2550,7 @@ executable('elogind-cgroups-agent',
 #                  include_directories : includes,
 #                  link_with : [libudev_core,
 #                               libsystemd_network,
-#                               libudev_internal],
+#                               libudev_static],
 #                  dependencies : [threads,
 #                                  libkmod,
 #                                  libidn,
@@ -2624,7 +2624,7 @@ executable('elogind-cgroups-agent',
 #                    include_directories : includes,
 #                    link_with : [libnetworkd_core,
 #                                 libsystemd_network,
-#                                 libudev_internal,
+#                                 libudev_static,
 #                                 libshared],
 #                    dependencies : [threads],
 #                    install_rpath : rootlibexecdir,
diff --git a/src/test/meson.build b/src/test/meson.build
index dcdba0ea3..ac8467ee6 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -74,7 +74,7 @@ tests += [
 #           'src/test/test-helper.c'],
 #          [libcore,
 #           libudev,
-#           libsystemd_static],
+#           libshared],
 #          [threads,
 #           librt,
 #           libseccomp,
@@ -446,8 +446,8 @@ tests += [
 #          [libcore,
 #           libjournal_core,
 #           libudev_core,
-#           libudev_internal,
-#           libelogind_network,
+#           libudev_static,
+#           libsystemd_network,
 #           libshared],
 #          [threads,
 #           libseccomp,
@@ -662,8 +662,8 @@ tests += [
 # 
 #         [['src/test/test-udev.c'],
 #          [libudev_core,
-#           libudev_internal,
-#           libelogind_network,
+#           libudev_static,
+#           libsystemd_network,
 #           libshared],
 #          [threads,
 #           librt,