chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
nspawn: use Barrier API instead of eventfd-util
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index aca30b956bdfff0766922c8b00f4374fdb872e81..fe680b0d948ab7d089ba7e4f5ec4ad6f93a6a143 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,8 +133,8 @@ polkitpolicy_in_files =
 polkitpolicy_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
-nodist_pkgsysconf_DATA =
 dist_pkgsysconf_DATA =
+nodist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
@@ -164,6 +164,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+       -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
        -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
@@ -840,10 +841,10 @@ libsystemd_shared_la_SOURCES = \
        src/shared/login-shared.h \
        src/shared/ring.c \
        src/shared/ring.h \
+       src/shared/barrier.c \
+       src/shared/barrier.h \
        src/shared/async.c \
        src/shared/async.h \
-       src/shared/eventfd-util.c \
-       src/shared/eventfd-util.h \
        src/shared/copy.c \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
@@ -1250,6 +1251,7 @@ tests += \
        test-ellipsize \
        test-util \
        test-ring \
+       test-barrier \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1420,6 +1422,12 @@ test_ring_SOURCES = \
 test_ring_LDADD = \
        libsystemd-core.la
 
+test_barrier_SOURCES = \
+       src/test/test-barrier.c
+
+test_barrier_LDADD = \
+       libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -1452,16 +1460,22 @@ test_list_LDADD = \
 
 test_tables_SOURCES = \
        src/test/test-tables.c \
-       src/shared/test-tables.h
+       src/shared/test-tables.h \
+       src/bus-proxyd/bus-policy.c \
+       src/bus-proxyd/bus-policy.h \
+       src/journal/journald-server.c \
+       src/journal/journald-server.h
 
 test_tables_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       -I$(srcdir)/src/bus-proxyd
 
 test_tables_LDADD = \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
        libsystemd-core.la \
+       libudev-core.la \
        $(RT_LIBS)
 
 test_prioq_SOURCES = \
@@ -1818,6 +1832,7 @@ nodist_systemunit_DATA += \
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/systemd-nologin.conf \
+       tmpfiles.d/systemd-remote.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
        tmpfiles.d/var.conf \
@@ -3371,16 +3386,6 @@ typelibs_DATA = \
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-hook:
-       libname=libgudev-1.0.so && $(move-to-rootlibdir)
-
-libgudev-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-
-INSTALL_EXEC_HOOKS += libgudev-install-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
 endif
 
 EXTRA_DIST += \
@@ -3449,19 +3454,20 @@ 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
+       src/journal-remote/journal-remote-parse.h \
+       src/journal-remote/journal-remote-parse.c \
+       src/journal-remote/journal-remote-write.h \
+       src/journal-remote/journal-remote-write.c \
+       src/journal-remote/journal-remote.h \
+       src/journal-remote/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
+       src/journal-remote/microhttpd-util.h \
+       src/journal-remote/microhttpd-util.c
 
 systemd_journal_remote_CFLAGS = \
        $(AM_CFLAGS) \
@@ -3473,7 +3479,70 @@ systemd_journal_remote_LDADD += \
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
        $(GNUTLS_LIBS)
+
+# systemd-journal-remote make sense mostly with full crypto stack
+dist_systemunit_DATA += \
+       units/systemd-journal-remote.socket
+
+nodist_systemunit_DATA += \
+       units/systemd-journal-remote.service
+
+EXTRA_DIST += \
+       units/systemd-journal-remote.service.in
+
+journal-remote-install-hook: journal-install-hook
+       -$(MKDIR_P) $(DESTDIR)/var/log/journal/remote
+       -chown 0:0 $(DESTDIR)/var/log/journal/remote
+       -chmod 755 $(DESTDIR)/var/log/journal/remote
+
+INSTALL_EXEC_HOOKS += journal-remote-install-hook
+
 endif
+
+nodist_pkgsysconf_DATA += \
+       src/journal-remote/journal-remote.conf
+
+EXTRA_DIST += \
+       src/journal-remote/journal-remote.conf.in
+
+CLEANFILES += \
+       src/journal-remote/journal-remote.conf
+endif
+
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+       systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+       src/journal-remote/journal-upload.h \
+       src/journal-remote/journal-upload.c \
+       src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+       libsystemd-core.la \
+       libsystemd-internal.la \
+       libsystemd-journal-internal.la \
+       libsystemd-shared.la \
+       $(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+       units/systemd-journal-upload.service
+
+EXTRA_DIST += \
+       units/systemd-journal-upload.service.in
+
+nodist_pkgsysconf_DATA += \
+       src/journal-remote/journal-upload.conf
+
+EXTRA_DIST += \
+       src/journal-remote/journal-upload.conf.in
+
+CLEANFILES += \
+       src/journal-remote/journal-upload.conf
 endif
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
@@ -3642,6 +3711,7 @@ journal-install-hook:
        -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
 
 journal-uninstall-hook:
+       -rmdir $(DESTDIR)/var/log/journal/remote
        -rmdir $(DESTDIR)/var/log/journal/
 
 INSTALL_EXEC_HOOKS += journal-install-hook
@@ -3803,9 +3873,9 @@ rootlibexec_PROGRAMS += \
        systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
-       src/journal/journal-gatewayd.c \
-       src/journal/microhttpd-util.h \
-       src/journal/microhttpd-util.c
+       src/journal-remote/journal-gatewayd.c \
+       src/journal-remote/microhttpd-util.h \
+       src/journal-remote/microhttpd-util.c
 
 systemd_journal_gatewayd_LDADD = \
        libsystemd-logs.la \
@@ -3834,7 +3904,7 @@ nodist_systemunit_DATA += \
        units/systemd-journal-gatewayd.service
 
 dist_gatewayddocumentroot_DATA = \
-       src/journal/browse.html
+       src/journal-remote/browse.html
 
 endif
 
@@ -4575,6 +4645,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-resolved.service
 
+dist_systemunit_DATA += \
+       units/org.freedesktop.resolve1.busname
+
 dist_dbuspolicy_DATA += \
        src/resolve/org.freedesktop.resolve1.conf
 
@@ -4584,6 +4657,12 @@ dist_dbussystemservice_DATA += \
 EXTRA_DIST += \
        units/systemd-resolved.service.in
 
+SYSTEM_UNIT_ALIASES += \
+       systemd-resolved.service dbus-org.freedesktop.resolve1.service
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.resolve1.busname
+
 GENERAL_ALIASES += \
        $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service
 
@@ -4718,8 +4797,17 @@ test_network_CFLAGS = \
 test_network_LDADD = \
        libsystemd-networkd-core.la
 
+test_network_tables_SOURCES = \
+       src/network/test-network-tables.c \
+       src/shared/test-tables.h
+
+test_network_tables_LDADD = \
+       libsystemd-networkd-core.la \
+       libudev-core.la
+
 tests += \
-       test-network
+       test-network \
+       test-network-tables
 
 nodist_systemunit_DATA += \
        units/systemd-networkd.service \
@@ -5270,6 +5358,7 @@ substitutions = \
        '|sysctldir=$(sysctldir)|' \
        '|systemgeneratordir=$(systemgeneratordir)|' \
        '|usergeneratordir=$(usergeneratordir)|' \
+       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -5322,6 +5411,9 @@ sysctl.d/%: sysctl.d/%.in
 %.pc: %.pc.in
        $(SED_PROCESS)
 
+%.conf: %.conf.in
+       $(SED_PROCESS)
+
 src/core/macros.%: src/core/macros.%.in
        $(SED_PROCESS)
 
Unnamed repository; edit this file 'description' to name the repository.