chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build-sys: move sd-login src/login → src/libsystemd/sd-login
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8dcbaca3d686c2edd590d93f277cb9e4348edacc..f0cfe46e766820c2398c8dc14959e810b6dc7d4f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -795,7 +795,11 @@ libsystemd_shared_la_SOURCES = \
        src/shared/bus-label.h \
        src/shared/gpt.h \
        src/shared/generator.h \
        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 \
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1176,7 +1180,8 @@ manual_tests += \
        test-cgroup \
        test-install \
        test-watchdog \
        test-cgroup \
        test-install \
        test-watchdog \
-       test-log
+       test-log \
+       test-ipcrm
 
 tests += \
        test-job-type \
 
 tests += \
        test-job-type \
@@ -1392,6 +1397,13 @@ test_log_SOURCES = \
 test_log_LDADD = \
        libsystemd-core.la
 
 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
 
 test_ellipsize_SOURCES = \
        src/test/test-ellipsize.c
 
@@ -2098,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/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 \
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym \
@@ -2743,10 +2753,8 @@ if HAVE_ACL
 libudev_core_la_SOURCES += \
        src/udev/udev-builtin-uaccess.c \
        src/login/logind-acl.c \
 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
 
 libudev_core_la_LIBADD += \
        libsystemd-acl.la
@@ -3120,6 +3128,38 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
        libsystemd-journal-core.la
 
 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)
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
@@ -3237,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-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 \
        src/journal/journald-native.c \
        src/journal/journald-native.h \
        src/journal/journald-rate-limit.c \
@@ -3425,6 +3467,11 @@ systemd_journal_gatewayd_LDADD = \
        libsystemd-shared.la \
        $(MICROHTTPD_LIBS)
 
        libsystemd-shared.la \
        $(MICROHTTPD_LIBS)
 
+if HAVE_GNUTLS
+systemd_journal_gatewayd_LDADD += \
+       $(GNUTLS_LIBS)
+endif
+
 systemd_journal_gatewayd_CFLAGS = \
        $(AM_CFLAGS) \
        $(MICROHTTPD_CFLAGS)
 systemd_journal_gatewayd_CFLAGS = \
        $(AM_CFLAGS) \
        $(MICROHTTPD_CFLAGS)
@@ -4055,7 +4102,8 @@ dist_dbuspolicy_DATA += \
        src/machine/org.freedesktop.machine1.conf
 
 dist_zshcompletion_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
 
 SYSTEM_UNIT_ALIASES += \
        systemd-machined.service dbus-org.freedesktop.machine1.service
@@ -4171,9 +4219,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-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 \
 
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
@@ -4233,7 +4279,7 @@ rootbin_PROGRAMS += \
        systemd-inhibit
 
 test_login_SOURCES = \
        systemd-inhibit
 
 test_login_SOURCES = \
-       src/login/test-login.c
+       src/libsystemd/sd-login/test-login.c
 
 test_login_LDADD = \
        libsystemd-internal.la \
 
 test_login_LDADD = \
        libsystemd-internal.la \
Unnamed repository; edit this file 'description' to name the repository.