meson: get rid of libfirewall

diff --git a/meson.build b/meson.build
index b18e645d39d8b012a10cba0f07220b219b754520..0d61ce19ab5f526ac32d2d35464861c70f404d83 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2146,8 +2146,7 @@ exe = executable('systemd-nspawn',
                  'src/core/loopback-setup.c',
                  'src/core/loopback-setup.h',
                  include_directories : [includes, include_directories('src/nspawn')],
-                 link_with : [libfirewall,
-                              libshared,
+                 link_with : [libshared,
                               libudev],
                  dependencies : [libacl,
                                  libblkid,
@@ -2162,7 +2161,6 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
                    systemd_networkd_sources,
                    include_directories : includes,
                    link_with : [libnetworkd_core,
-                                libfirewall,
                                 libsystemd_network,
                                 libudev_internal,
                                 libshared],

diff --git a/src/network/meson.build b/src/network/meson.build
index 4d76902ef131d8319f2566e8bcd8f31e3dc8ccd8..771aa68ec1202d0c14efdad2bb50c4ae1c51dc80 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -128,8 +128,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
      [libnetworkd_core,
       libudev_internal,
       libsystemd_network,
-      libshared,
-      libfirewall],
+      libshared],
      []],
 
     [['src/network/test-network-tables.c',
@@ -139,8 +138,7 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
       libudev_internal,
       libudev_core,
       libsystemd_network,
-      libshared,
-      libfirewall],
+      libshared],
      [],
      '', '', [],
      [network_include_dir] + libudev_core_includes],

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 7d51e99487950e1823a6eaf78878128405e06a0b..0747f766491eacca44594cdcefc98d16732c09e5 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -34,6 +34,7 @@ shared_sources = '''
         efivars.h
         fdset.c
         fdset.h
+        firewall-util.h
         fstab-util.c
         fstab-util.h
         gcrypt-util.c
@@ -114,6 +115,10 @@ if conf.get('HAVE_SECCOMP', 0) == 1
         shared_sources += ['seccomp-util.c']
 endif
 
+if conf.get('HAVE_LIBIPTC', 0) == 1
+        shared_sources += ['firewall-util.c']
+endif
+
 libshared_name = 'systemd-shared-@0@'.format(meson.project_version())
 
 libshared = shared_library(
@@ -132,6 +137,7 @@ libshared = shared_library(
                         libacl,
                         libcryptsetup,
                         libgcrypt,
+                        libiptc,
                         libseccomp,
                         libselinux,
                         libidn,
@@ -157,14 +163,3 @@ libshared_static = static_library(
                         libxz,
                         liblz4,
                         libblkid])
-
-if conf.get('HAVE_LIBIPTC', 0) == 1
-        libfirewall = static_library(
-                'firewall',
-                'firewall-util.h',
-                'firewall-util.c',
-                include_directories : includes,
-                dependencies : [libiptc])
-else
-        libfirewall = []
-endif

diff --git a/src/test/meson.build b/src/test/meson.build
index 6c0fd4dca9a0b0bd1375524d0253b7ac041750ef..bbb525d6fef0c8857aa6aff1d6c52ef4bb456292 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -415,8 +415,7 @@ tests += [
 
 
         [['src/test/test-firewall-util.c'],
-         [libfirewall,
-          libshared],
+         [libshared],
          [],
          'HAVE_LIBIPTC'],