X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=65a7ffeb2720ea440f6ce6c16843597701b894e5;hp=bd78f444c506eee885597c9d783ccc60ab0da80d;hb=eb34d4af3fd2ddfaa4bdb591a1549d203e2d8ac8;hpb=0ce91e4e3ba60d5c87307c1be4a3f6095790c4c2 diff --git a/Makefile.am b/Makefile.am index bd78f444c..65a7ffeb2 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 \ @@ -794,7 +795,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 +1180,8 @@ manual_tests += \ test-cgroup \ test-install \ test-watchdog \ - test-log + test-log \ + test-ipcrm tests += \ test-job-type \ @@ -1391,6 +1397,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 +2110,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 \ @@ -2742,10 +2753,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 +3128,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 +3277,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 +3467,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 +3851,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 +3943,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 +4005,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 +4104,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 +4221,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 +4281,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 \ @@ -4735,7 +4804,7 @@ CLEANFILES += \ # ------------------------------------------------------------------------------ if ENABLE_MANPAGES -man/custom-entities.ent: +man/custom-entities.ent: configure.ac $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '' && \ printf '$(subst '|,\n,$(substitutions))))') \