activate: export make_socket_fd

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bd78f444c506eee885597c9d783ccc60ab0da80d..9e01cd520bb8cb5f0deca018a03d5019cb92bda8 100644 (file)
--- 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,9 @@ 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
 
 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
 
@@ -3236,6 +3247,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 \
@@ -3893,13 +3906,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 +3968,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 +4067,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
@@ -4735,7 +4769,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 '<?xml version="1.0" encoding="utf-8" ?>' && \
         printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \