chiark / gitweb /
journal-upload: a tool to push messages to systemd-journal-remote
[elogind.git] / Makefile.am
index 321379ca5fa7994d510968c0a0b1d052b3b5488e..371468f6bebb7518665ec2476313de1339b37082 100644 (file)
@@ -106,7 +106,6 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
-ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -337,7 +336,8 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-machine-id-setup
+       systemd-machine-id-setup \
+       systemd-escape
 
 bin_PROGRAMS = \
        systemd-cgls \
@@ -382,7 +382,6 @@ systemgenerator_PROGRAMS = \
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
        shell-completion/bash/journalctl \
-       shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/systemd-cat \
        shell-completion/bash/systemd-cgls \
@@ -394,8 +393,10 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/udevadm \
        shell-completion/bash/kernel-install
 
+nodist_bashcompletion_DATA = \
+       shell-completion/bash/systemctl
+
 dist_zshcompletion_DATA = \
-       shell-completion/zsh/_systemctl \
        shell-completion/zsh/_journalctl \
        shell-completion/zsh/_udevadm \
        shell-completion/zsh/_kernel-install \
@@ -406,13 +407,23 @@ dist_zshcompletion_DATA = \
        shell-completion/zsh/_systemd-delta \
        shell-completion/zsh/_systemd
 
+nodist_zshcompletion_DATA = \
+       shell-completion/zsh/_systemctl
+
+EXTRA_DIST += \
+       shell-completion/bash/systemctl.in \
+       shell-completion/zsh/_systemctl.in
+
+CLEANFILES += \
+       $(nodist_bashcompletion_DATA) \
+       $(nodist_zshcompletion_DATA)
+
 dist_sysctl_DATA = \
        sysctl.d/50-default.conf
 
 dist_systemunit_DATA = \
        units/graphical.target \
        units/multi-user.target \
-       units/emergency.service \
        units/emergency.target \
        units/sysinit.target \
        units/basic.target \
@@ -765,6 +776,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/pager.h \
        src/shared/socket-util.c \
        src/shared/socket-util.h \
+       src/shared/in-addr-util.c \
+       src/shared/in-addr-util.h \
        src/shared/conf-files.c \
        src/shared/conf-files.h \
        src/shared/cgroup-util.c \
@@ -834,7 +847,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/copy.c \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
-       src/shared/base-filesystem.h
+       src/shared/base-filesystem.h \
+       src/shared/nss-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1894,15 +1908,8 @@ nodist_systemunit_DATA += \
 EXTRA_DIST += \
        units/systemd-firstboot.service.in
 
-systemgenerator_PROGRAMS += \
-       systemd-firstboot-generator
-
-systemd_firstboot_generator_SOURCES = \
-       src/firstboot/firstboot-generator.c
-
-systemd_firstboot_generator_LDADD = \
-       libsystemd-label.la \
-       libsystemd-shared.la
+SYSINIT_TARGET_WANTS += \
+       systemd-firstboot.service
 
 endif
 
@@ -2115,6 +2122,13 @@ systemd_cgroups_agent_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+       src/escape/escape.c
+
+systemd_escape_LDADD = \
+       libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
 systemctl_SOURCES = \
        src/systemctl/systemctl.c
 
@@ -2320,6 +2334,8 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-rtnl/rtnl-types.c \
        src/libsystemd/sd-rtnl/rtnl-util.h \
        src/libsystemd/sd-rtnl/rtnl-util.c \
+       src/libsystemd/sd-rtnl/local-addresses.h \
+       src/libsystemd/sd-rtnl/local-addresses.c \
        src/libsystemd/sd-id128/sd-id128.c \
        src/libsystemd/sd-daemon/sd-daemon.c \
        src/libsystemd/sd-login/sd-login.c \
@@ -3433,19 +3449,19 @@ 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.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) \
@@ -3460,6 +3476,24 @@ systemd_journal_remote_LDADD += \
 endif
 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
+
+systemd_journal_upload_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+       libsystemd-core.la \
+       libsystemd-internal.la \
+       $(LIBCURL_LIBS)
+endif
+
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
@@ -3662,9 +3696,11 @@ tests += \
        test-mmap-cache \
        test-catalog
 
+if HAVE_COMPRESSION
 tests += \
        test-compress \
        test-compress-benchmark
+endif
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
@@ -3785,9 +3821,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 \
@@ -3816,7 +3852,7 @@ nodist_systemunit_DATA += \
        units/systemd-journal-gatewayd.service
 
 dist_gatewayddocumentroot_DATA = \
-       src/journal/browse.html
+       src/journal-remote/browse.html
 
 endif
 
@@ -4319,10 +4355,6 @@ dist_systemunit_DATA += \
 polkitpolicy_files += \
        src/timedate/org.freedesktop.timedate1.policy
 
-INSTALL_DIRS += \
-       $(prefix)/lib/systemd/ntp-units.d \
-       $(sysconfdir)/systemd/ntp-units.d
-
 SYSTEM_UNIT_ALIASES += \
        systemd-timedated.service dbus-org.freedesktop.timedate1.service
 
@@ -4396,18 +4428,13 @@ EXTRA_DIST += \
 
 CLEANFILES += \
        src/timesync/timesyncd.conf
-
-dist_ntpunits_DATA = \
-       src/timesync/90-systemd.list
-
 endif
 
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
-       src/nss-myhostname/nss-myhostname.c \
-       src/nss-myhostname/ifconf.h \
-       src/nss-myhostname/netlink.c
+       src/nss-myhostname/nss-myhostname.sym \
+       src/nss-myhostname/nss-myhostname.c
 
 libnss_myhostname_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4415,7 +4442,8 @@ libnss_myhostname_la_LDFLAGS = \
        -export-dynamic \
        -avoid-version \
        -shared \
-       -shrext .so.2
+       -shrext .so.2 \
+       -Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym
 
 libnss_myhostname_la_LIBADD = \
        libsystemd-shared.la \
@@ -4500,6 +4528,25 @@ BUSNAMES_TARGET_WANTS += \
 EXTRA_DIST += \
        units/systemd-machined.service.in
 
+libnss_mymachines_la_SOURCES = \
+       src/nss-mymachines/nss-mymachines.sym \
+       src/nss-mymachines/nss-mymachines.c
+
+libnss_mymachines_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -shrext .so.2 \
+       -Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym
+
+libnss_mymachines_la_LIBADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la
+
+lib_LTLIBRARIES += \
+       libnss_mymachines.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -4507,11 +4554,22 @@ if ENABLE_RESOLVED
 systemd_resolved_SOURCES = \
        src/resolve/resolved.h \
        src/resolve/resolved.c \
-       src/resolve/resolved-manager.c
-
-systemd_resolved_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       src/resolve/resolved-manager.c \
+       src/resolve/resolved-bus.c \
+       src/resolve/resolved-link.h \
+       src/resolve/resolved-link.c \
+       src/resolve/resolved-dns-domain.h \
+       src/resolve/resolved-dns-domain.c \
+       src/resolve/resolved-dns-packet.h \
+       src/resolve/resolved-dns-packet.c \
+       src/resolve/resolved-dns-query.h \
+       src/resolve/resolved-dns-query.c \
+       src/resolve/resolved-dns-scope.h \
+       src/resolve/resolved-dns-scope.c \
+       src/resolve/resolved-dns-server.h \
+       src/resolve/resolved-dns-server.c \
+       src/resolve/resolved-dns-rr.h \
+       src/resolve/resolved-dns-rr.c
 
 nodist_systemd_resolved_SOURCES = \
        src/resolve/resolved-gperf.c
@@ -4535,9 +4593,24 @@ 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
+
+dist_dbussystemservice_DATA += \
+       src/resolve/org.freedesktop.resolve1.service
+
 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
 
@@ -4550,6 +4623,41 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/resolve/resolved.conf
 
+tests += \
+       test-dns-domain
+
+test_dns_domain_SOURCES = \
+       src/resolve/resolved-dns-domain.h \
+       src/resolve/resolved-dns-domain.c \
+       src/resolve/test-dns-domain.c
+
+test_dns_domain_LDADD = \
+       libsystemd-capability.la \
+       libsystemd-network.la \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+libnss_resolve_la_SOURCES = \
+       src/nss-resolve/nss-resolve.sym \
+       src/nss-resolve/nss-resolve.c
+
+libnss_resolve_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -shrext .so.2 \
+       -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
+
+libnss_resolve_la_LIBADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la
+
+lib_LTLIBRARIES += \
+       libnss_resolve.la
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -4573,15 +4681,27 @@ libsystemd_networkd_core_la_CFLAGS = \
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
-       src/network/networkd-link.c \
+       src/network/networkd-netdev.h \
+       src/network/networkd-netdev-tunnel.h \
+       src/network/networkd-netdev-veth.h \
+       src/network/networkd-netdev-vxlan.h \
+       src/network/networkd-netdev-vlan.h \
+       src/network/networkd-netdev-macvlan.h \
+       src/network/networkd-netdev-dummy.h \
+       src/network/networkd-netdev-tuntap.h \
+       src/network/networkd-netdev-bond.h \
+       src/network/networkd-netdev-bridge.h \
        src/network/networkd-netdev.c \
-       src/network/networkd-tunnel.c \
-       src/network/networkd-veth.c \
-       src/network/networkd-vxlan.c \
-       src/network/networkd-vlan.c \
-       src/network/networkd-macvlan.c \
-       src/network/networkd-dummy.c \
-       src/network/networkd-tuntap.c \
+       src/network/networkd-netdev-tunnel.c \
+       src/network/networkd-netdev-veth.c \
+       src/network/networkd-netdev-vxlan.c \
+       src/network/networkd-netdev-vlan.c \
+       src/network/networkd-netdev-macvlan.c \
+       src/network/networkd-netdev-dummy.c \
+       src/network/networkd-netdev-tuntap.c \
+       src/network/networkd-netdev-bond.c \
+       src/network/networkd-netdev-bridge.c \
+       src/network/networkd-link.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -5235,6 +5355,9 @@ src/core/macros.%: src/core/macros.%.in
 src/%.policy.in: src/%.policy.in.in
        $(SED_PROCESS)
 
+shell-completion/%: shell-completion/%.in
+       $(SED_PROCESS)
+
 %.rules: %.rules.in
        $(SED_PROCESS)
 
@@ -5262,7 +5385,7 @@ units/user/%: units/%.m4
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
-dist_polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
        $(polkitpolicy_files) \
        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
 endif
@@ -5642,7 +5765,8 @@ test-libsystemd-sym.c: \
                src/systemd/sd-login.h \
                src/systemd/sd-bus.h \
                src/systemd/sd-utf8.h \
-               src/systemd/sd-resolve.h
+               src/systemd/sd-resolve.h \
+               src/systemd/sd-path.h
        $(generate-sym-test)
 
 test-libudev-sym.c: \