diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 77 |
1 files changed, 23 insertions, 54 deletions
diff --git a/Makefile.am b/Makefile.am index 5b519482ff..1dd6dbd5e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1021,6 +1021,7 @@ libshared_la_CFLAGS = \ libshared_la_LIBADD = \ libsystemd-internal.la \ libsystemd-journal-internal.la \ + libudev-internal.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) @@ -1031,8 +1032,8 @@ noinst_LTLIBRARIES += \ libfirewall.la libfirewall_la_SOURCES = \ - src/shared/fw-util.h \ - src/shared/fw-util.c + src/shared/firewall-util.h \ + src/shared/firewall-util.c libfirewall_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1187,10 +1188,10 @@ libcore_la_CFLAGS = \ $(AUDIT_CFLAGS) \ $(KMOD_CFLAGS) \ $(APPARMOR_CFLAGS) \ - $(MOUNT_CFLAGS) + $(MOUNT_CFLAGS) \ + $(SECCOMP_CFLAGS) libcore_la_LIBADD = \ - libudev-internal.la \ libshared.la \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ @@ -1316,6 +1317,10 @@ src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt systemd_SOURCES = \ src/core/main.c +systemd_CFLAGS = \ + $(AM_CFLAGS) \ + $(SECCOMP_CFLAGS) + systemd_LDADD = \ libcore.la @@ -1358,7 +1363,7 @@ manual_tests += \ if HAVE_LIBIPTC manual_tests += \ - test-fw-util + test-firewall-util endif if HAVE_KMOD @@ -1799,7 +1804,6 @@ test_tables_CFLAGS = \ $(SECCOMP_CFLAGS) test_tables_LDADD = \ - libsystemd-journal-internal.la \ libjournal-core.la \ libcore.la \ libudev-core.la @@ -1847,14 +1851,14 @@ test_btrfs_LDADD = \ libshared.la if HAVE_LIBIPTC -test_fw_util_SOURCES = \ - src/test/test-fw-util.c +test_firewall_util_SOURCES = \ + src/test/test-firewall-util.c -test_fw_util_CFLAGS = \ +test_firewall_util_CFLAGS = \ $(AM_CFLAGS) \ $(LIBIPTC_CFLAGS) -test_fw_util_LDADD = \ +test_firewall_util_LDADD = \ libfirewall.la \ libshared.la \ $(LIBIPTC_LIBS) @@ -2119,7 +2123,6 @@ systemd_shutdown_SOURCES = \ src/core/killall.c systemd_shutdown_LDADD = \ - libudev-internal.la \ libshared.la # ------------------------------------------------------------------------------ @@ -2185,7 +2188,8 @@ dist_tmpfiles_DATA = \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf \ tmpfiles.d/var.conf \ - tmpfiles.d/home.conf + tmpfiles.d/home.conf \ + tmpfiles.d/systemd-nspawn.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -2304,7 +2308,6 @@ systemd_fsck_SOURCES = \ src/fsck/fsck.c systemd_fsck_LDADD = \ - libudev-internal.la \ libshared.la # ------------------------------------------------------------------------------ @@ -2324,7 +2327,6 @@ systemd_ac_power_SOURCES = \ src/ac-power/ac-power.c systemd_ac_power_LDADD = \ - libudev-internal.la \ libshared.la # ------------------------------------------------------------------------------ @@ -2611,7 +2613,6 @@ systemd_gpt_auto_generator_SOURCES = \ src/basic/blkid-util.h systemd_gpt_auto_generator_LDADD = \ - libudev-internal.la \ libshared.la \ $(BLKID_LIBS) @@ -2688,7 +2689,6 @@ systemctl_SOURCES = \ src/systemctl/systemctl.c systemctl_LDADD = \ - libsystemd-journal-internal.la \ libshared.la # ------------------------------------------------------------------------------ @@ -2743,10 +2743,10 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_CFLAGS = \ $(AM_CFLAGS) \ - $(BLKID_CFLAGS) + $(BLKID_CFLAGS) \ + $(SECCOMP_CFLAGS) systemd_nspawn_LDADD = \ - libudev-internal.la \ libshared.la \ $(BLKID_LIBS) @@ -3227,7 +3227,6 @@ test_dhcp_client_SOURCES = \ test_dhcp_client_LDADD = \ libsystemd-network.la \ - libudev-internal.la \ libshared.la test_dhcp_server_SOURCES = \ @@ -3361,7 +3360,6 @@ libsystemd_terminal_la_SOURCES = \ src/libsystemd-terminal/unifont.c libsystemd_terminal_la_LIBADD = \ - libudev-internal.la \ libshared.la \ $(TERMINAL_LIBS) @@ -3615,7 +3613,6 @@ libudev_core_la_CFLAGS = \ $(KMOD_CFLAGS) libudev_core_la_LIBADD = \ - libudev-internal.la \ libsystemd-network.la \ libshared.la \ $(BLKID_LIBS) \ @@ -3674,7 +3671,6 @@ systemd_hwdb_SOURCES = \ src/hwdb/hwdb.c systemd_hwdb_LDADD = \ - libudev-internal.la \ libshared.la rootbin_PROGRAMS += \ @@ -3742,7 +3738,6 @@ test_libudev_SOURCES = \ src/test/test-libudev.c test_libudev_LDADD = \ - libudev-internal.la \ libshared.la test_udev_SOURCES = \ @@ -3779,7 +3774,6 @@ ata_id_SOURCES = \ src/udev/ata_id/ata_id.c ata_id_LDADD = \ - libudev-internal.la \ libshared.la udevlibexec_PROGRAMS += \ @@ -3790,7 +3784,6 @@ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c cdrom_id_LDADD = \ - libudev-internal.la \ libshared.la udevlibexec_PROGRAMS += \ @@ -3804,7 +3797,6 @@ collect_SOURCES = \ src/udev/collect/collect.c collect_LDADD = \ - libudev-internal.la \ libshared.la udevlibexec_PROGRAMS += \ @@ -3818,7 +3810,6 @@ scsi_id_SOURCES =\ src/udev/scsi_id/scsi_id.h scsi_id_LDADD = \ - libudev-internal.la \ libshared.la udevlibexec_PROGRAMS += \ @@ -3832,7 +3823,6 @@ v4l_id_SOURCES = \ src/udev/v4l_id/v4l_id.c v4l_id_LDADD = \ - libudev-internal.la \ libshared.la udevlibexec_PROGRAMS += \ @@ -3846,7 +3836,6 @@ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev-internal.la \ libshared.la udevlibexec_PROGRAMS += \ @@ -3982,7 +3971,6 @@ systemd_journal_upload_CFLAGS = \ $(LIBCURL_CFLAGS) systemd_journal_upload_LDADD = \ - libsystemd-journal-internal.la \ libshared.la \ $(LIBCURL_LIBS) @@ -4006,7 +3994,6 @@ journalctl_SOURCES = \ src/journal/journalctl.c journalctl_LDADD = \ - libsystemd-journal-internal.la \ libshared.la if HAVE_QRENCODE @@ -4101,14 +4088,12 @@ test_compress_SOURCES = \ src/journal/test-compress.c test_compress_LDADD = \ - libsystemd-journal-internal.la \ libshared.la test_compress_benchmark_SOURCES = \ src/journal/test-compress-benchmark.c test_compress_benchmark_LDADD = \ - libsystemd-journal-internal.la \ libshared.la test_audit_type_SOURCES = \ @@ -4142,8 +4127,6 @@ nodist_libjournal_core_la_SOURCES = \ src/journal/journald-gperf.c libjournal_core_la_LIBADD = \ - libsystemd-journal-internal.la \ - libudev-internal.la \ libshared.la noinst_LTLIBRARIES += \ @@ -4296,6 +4279,8 @@ dist_pkgsysconf_DATA += \ src/journal/journald.conf dist_catalog_DATA = \ + catalog/systemd.be.catalog \ + catalog/systemd.be@latin.catalog \ catalog/systemd.fr.catalog \ catalog/systemd.it.catalog \ catalog/systemd.pl.catalog \ @@ -4335,7 +4320,6 @@ systemd_journal_gatewayd_SOURCES = \ src/journal-remote/microhttpd-util.c systemd_journal_gatewayd_LDADD = \ - libsystemd-journal-internal.la \ libshared.la \ $(MICROHTTPD_LIBS) @@ -4372,7 +4356,6 @@ systemd_socket_proxyd_SOURCES = \ src/socket-proxy/socket-proxyd.c systemd_socket_proxyd_LDADD = \ - libsystemd-journal-internal.la \ libshared.la # ------------------------------------------------------------------------------ @@ -4383,7 +4366,6 @@ systemd_coredump_SOURCES = \ src/journal/coredump-vacuum.h systemd_coredump_LDADD = \ - libsystemd-journal-internal.la \ libshared.la if HAVE_ELFUTILS @@ -4405,7 +4387,6 @@ coredumpctl_SOURCES = \ src/journal/coredumpctl.c coredumpctl_LDADD = \ - libsystemd-journal-internal.la \ libshared.la bin_PROGRAMS += \ @@ -4505,7 +4486,6 @@ systemd_bootchart_SOURCES = \ src/bootchart/svg.h systemd_bootchart_LDADD = \ - libsystemd-journal-internal.la \ libshared.la rootlibexec_PROGRAMS += \ @@ -4576,7 +4556,6 @@ systemd_backlight_SOURCES = \ src/backlight/backlight.c systemd_backlight_LDADD = \ - libudev-internal.la \ libshared.la endif @@ -4595,7 +4574,6 @@ systemd_rfkill_SOURCES = \ src/rfkill/rfkill.c systemd_rfkill_LDADD = \ - libudev-internal.la \ libshared.la endif @@ -4622,7 +4600,6 @@ systemd_cryptsetup_CFLAGS = \ $(LIBCRYPTSETUP_CFLAGS) systemd_cryptsetup_LDADD = \ - libudev-internal.la \ libshared.la \ $(LIBCRYPTSETUP_LIBS) @@ -4903,7 +4880,6 @@ libmachine_core_la_SOURCES = \ src/machine/image-dbus.h libmachine_core_la_LIBADD = \ - libudev-internal.la \ libshared.la noinst_LTLIBRARIES += \ @@ -4913,7 +4889,6 @@ machinectl_SOURCES = \ src/machine/machinectl.c machinectl_LDADD = \ - libsystemd-journal-internal.la \ libshared.la rootbin_PROGRAMS += \ @@ -5352,7 +5327,6 @@ nodist_libnetworkd_core_la_SOURCES = \ src/network/networkd-netdev-gperf.c libnetworkd_core_la_LIBADD = \ - libudev-internal.la \ libsystemd-network.la \ libshared.la @@ -5372,7 +5346,6 @@ systemd_networkd_wait_online_SOURCES = \ systemd_networkd_wait_online_LDADD = \ libsystemd-network.la \ - libudev-internal.la \ libshared.la rootbin_PROGRAMS += \ @@ -5382,7 +5355,6 @@ networkctl_SOURCES = \ src/network/networkctl.c networkctl_LDADD = \ - libudev-internal.la \ libshared.la \ libsystemd-network.la @@ -5488,7 +5460,6 @@ liblogind_core_la_SOURCES = \ src/login/logind-acl.h liblogind_core_la_LIBADD = \ - libudev-internal.la \ libshared.la if HAVE_ACL @@ -5508,8 +5479,6 @@ loginctl_SOURCES = \ src/login/sysfs-show.c loginctl_LDADD = \ - libudev-internal.la \ - libsystemd-journal-internal.la \ libshared.la rootbin_PROGRAMS += \ @@ -5872,7 +5841,7 @@ libsystemd_login_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym libsystemd_login_la_LIBADD = \ - libshared.la + libsystemd-internal.la libsystemd_id128_la_SOURCES = \ libsystemd-id128.c \ @@ -5888,7 +5857,7 @@ libsystemd_id128_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libshared.la + libsystemd-internal.la libsystemd_daemon_la_SOURCES = \ libsystemd-daemon.c \ @@ -5904,7 +5873,7 @@ libsystemd_daemon_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym libsystemd_daemon_la_LIBADD = \ - libshared.la + libsystemd-internal.la lib_LTLIBRARIES += \ libsystemd-journal.la \ |