diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-27 13:37:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-27 13:37:01 -0400 |
commit | 00a313261e840efcf8e82031e46a31918b49a74d (patch) | |
tree | b8d75bd8dd54eb278a902ad85ee0bfccab441943 /src/shared | |
parent | d8431fc3f4f49f4420f7afe3e0363092563378a3 (diff) | |
parent | c3045943c4ea2f63e62f85e64fcf1a862b82ac7d (diff) |
Merge pull request #5821 from mbiebl/meson-no-libiptc
Merge libfirewall into libshared, and link libshared to libip[46]tc directly.
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/meson.build | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/shared/meson.build b/src/shared/meson.build index 8968127d3f..0747f76649 100644 --- 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( @@ -152,21 +157,9 @@ libshared_static = static_library( libcap, libacl, libcryptsetup, - libiptc, libseccomp, libselinux, libidn, 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 |