X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=54cd1c6bdf5d1bd3e3f68efb184a8576d96967f6;hp=2e4f8573845ed9568b89c01c4bbb1a1158d8c9d9;hb=374c356979ba7222fa7e09005824fe6996b0e91e;hpb=a878789268a0d3e165cde1b816534d40bddf78c4 diff --git a/Makefile.am b/Makefile.am index 2e4f85738..54cd1c6bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -186,6 +186,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/network \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ + -I $(top_srcdir)/src/timedate \ -I $(top_srcdir)/src/systemd \ -I $(top_builddir)/src/core \ -I $(top_srcdir)/src/core \ @@ -778,8 +779,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/ima-util.h \ src/shared/ptyfwd.c \ src/shared/ptyfwd.h \ - src/shared/net-util.c \ - src/shared/net-util.h \ src/shared/errno-list.c \ src/shared/errno-list.h \ src/shared/af-list.c \ @@ -794,7 +793,11 @@ libsystemd_shared_la_SOURCES = \ src/shared/bus-label.h \ src/shared/gpt.h \ src/shared/generator.h \ - src/shared/generator.c + src/shared/generator.c \ + src/shared/clean-ipc.h \ + src/shared/clean-ipc.c \ + src/shared/login-shared.c \ + src/shared/login-shared.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1175,7 +1178,8 @@ manual_tests += \ test-cgroup \ test-install \ test-watchdog \ - test-log + test-log \ + test-ipcrm tests += \ test-job-type \ @@ -1391,6 +1395,13 @@ test_log_SOURCES = \ test_log_LDADD = \ libsystemd-core.la +test_ipcrm_SOURCES = \ + src/test/test-ipcrm.c + +test_ipcrm_LDADD = \ + libsystemd-shared.la \ + -lrt + test_ellipsize_SOURCES = \ src/test/test-ellipsize.c @@ -2097,9 +2108,7 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-resolve/resolve-util.h \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ - src/login/sd-login.c \ - src/login/login-shared.c \ - src/login/login-shared.h + src/libsystemd/sd-login/sd-login.c nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2449,7 +2458,9 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/sd-ipv4ll.c \ src/libsystemd-network/ipv4ll-network.c \ src/libsystemd-network/ipv4ll-packet.c \ - src/libsystemd-network/ipv4ll-internal.h + src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/network-internal.c \ + src/libsystemd-network/network-internal.h libsystemd_network_la_LIBADD = \ libsystemd-label.la \ @@ -2709,6 +2720,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-internal.la \ + libsystemd-network.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2742,10 +2754,8 @@ if HAVE_ACL libudev_core_la_SOURCES += \ src/udev/udev-builtin-uaccess.c \ src/login/logind-acl.c \ - src/login/sd-login.c \ - src/systemd/sd-login.h \ - src/login/login-shared.c \ - src/login/login-shared.h + src/libsystemd/sd-login/sd-login.c \ + src/systemd/sd-login.h libudev_core_la_LIBADD += \ libsystemd-acl.la @@ -3119,6 +3129,38 @@ systemd_cat_SOURCES = \ systemd_cat_LDADD = \ libsystemd-journal-core.la +if HAVE_MICROHTTPD +rootlibexec_PROGRAMS += \ + systemd-journal-remote + +systemd_journal_remote_SOURCES = \ + src/journal/journal-remote-parse.h \ + src/journal/journal-remote-parse.c \ + src/journal/journal-remote-write.h \ + src/journal/journal-remote-write.c \ + src/journal/journal-remote.c + +systemd_journal_remote_LDADD = \ + libsystemd-internal.la \ + libsystemd-journal-core.la + +systemd_journal_remote_SOURCES += \ + src/journal/microhttpd-util.h \ + src/journal/microhttpd-util.c + +systemd_journal_remote_CFLAGS = \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +systemd_journal_remote_LDADD += \ + $(MICROHTTPD_LIBS) + +if HAVE_GNUTLS +systemd_journal_remote_LDADD += \ + $(GNUTLS_LIBS) +endif +endif + # using _CFLAGS = in the conditional below would suppress AM_CFLAGS journalctl_CFLAGS = \ $(AM_CFLAGS) @@ -3236,6 +3278,8 @@ libsystemd_journal_core_la_SOURCES = \ src/journal/journald-server.h \ src/journal/journald-console.c \ src/journal/journald-console.h \ + src/journal/journald-wall.c \ + src/journal/journald-wall.h \ src/journal/journald-native.c \ src/journal/journald-native.h \ src/journal/journald-rate-limit.c \ @@ -3424,6 +3468,11 @@ systemd_journal_gatewayd_LDADD = \ libsystemd-shared.la \ $(MICROHTTPD_LIBS) +if HAVE_GNUTLS +systemd_journal_gatewayd_LDADD += \ + $(GNUTLS_LIBS) +endif + systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ $(MICROHTTPD_CFLAGS) @@ -3803,10 +3852,12 @@ nodist_systemunit_DATA += \ units/systemd-bus-driverd.service dist_systemunit_DATA += \ - units/org.freedesktop.DBus.busname + units/org.freedesktop.DBus.busname \ + units/org.freedesktop.systemd1.busname BUSNAMES_TARGET_WANTS += \ - org.freedesktop.DBus.busname + org.freedesktop.DBus.busname \ + org.freedesktop.systemd1.busname nodist_userunit_DATA += \ units/user/systemd-bus-driverd.service @@ -3893,13 +3944,24 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TIMEDATED +libsystemd_timedated_core_la_SOURCES = \ + src/timedate/timedate-sntp.c \ + src/timedate/timedate-sntp.h + +libsystemd_timedated_core_la_LIBADD = \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + -lm + +noinst_LTLIBRARIES += \ + libsystemd-timedated-core.la + systemd_timedated_SOURCES = \ src/timedate/timedated.c systemd_timedated_LDADD = \ - libsystemd-label.la \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-timedated-core.la rootlibexec_PROGRAMS += \ systemd-timedated @@ -3944,6 +4006,15 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_timedatectl + +test_timedate_sntp_SOURCES = \ + src/timedate/test-timedate-sntp.c + +test_timedate_sntp_LDADD = \ + libsystemd-timedated-core.la + +manual_tests += \ + test-timedate-sntp endif polkitpolicy_in_files += \ @@ -4034,7 +4105,8 @@ dist_dbuspolicy_DATA += \ src/machine/org.freedesktop.machine1.conf dist_zshcompletion_DATA += \ - shell-completion/zsh/_machinectl + shell-completion/zsh/_machinectl \ + shell-completion/zsh/_sd_machines SYSTEM_UNIT_ALIASES += \ systemd-machined.service dbus-org.freedesktop.machine1.service @@ -4150,9 +4222,7 @@ libsystemd_logind_core_la_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ - src/login/logind-acl.h \ - src/login/login-shared.c \ - src/login/login-shared.h + src/login/logind-acl.h libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ @@ -4212,7 +4282,7 @@ rootbin_PROGRAMS += \ systemd-inhibit test_login_SOURCES = \ - src/login/test-login.c + src/libsystemd/sd-login/test-login.c test_login_LDADD = \ libsystemd-internal.la \