unit: use the UNIT() macro consistently

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2279ff48c05f07ba7ef9ef3a156765bd48b02376..607ae7eadd7a837f6163a08928f6a078a060d4fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
+sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 
@@ -1208,9 +1209,13 @@ systemd_journald_SOURCES = \
        src/journal/lookup3.c \
        src/journal/journal-rate-limit.c \
        src/sd-id128.c \
-       src/acl-util.c \
        src/cgroup-util.c
 
+if HAVE_ACL
+systemd_journald_SOURCES += \
+       src/acl-util.c
+endif
+
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
 
@@ -1233,6 +1238,13 @@ systemd_journald_LDADD += \
        $(XZ_LIBS)
 endif
 
+systemd_cat_SOURCES = \
+        src/journal/cat.c
+
+systemd_cat_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-journal.la
+
 systemd_journalctl_SOURCES = \
        src/journal/journalctl.c \
        src/pager.c \
@@ -1341,6 +1353,9 @@ rootlibexec_PROGRAMS += \
 rootbin_PROGRAMS += \
        systemd-journalctl
 
+bin_PROGRAMS += \
+        systemd-cat
+
 dist_systemunit_DATA += \
        units/systemd-journald.socket
 
@@ -1383,6 +1398,27 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/journal/journald-gperf.c
 
+if ENABLE_COREDUMP
+
+systemd_coredump_SOURCES = \
+        src/journal/coredump.c
+
+systemd_coredump_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-journal.la \
+       libsystemd-login.la
+
+rootlibexec_PROGRAMS += \
+        systemd-coredump
+
+sysctl_DATA = \
+        sysctl.d/coredump.conf
+
+EXTRA_DIST += \
+        sysctl.d/coredump.conf.in
+
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
 systemd_binfmt_SOURCES = \
@@ -2060,6 +2096,9 @@ units/%: units/%.in Makefile
 man/%: man/%.in Makefile
        $(SED_PROCESS)
 
+sysctl.d/%: sysctl.d/%.in Makefile
+       $(SED_PROCESS)
+
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
@@ -2442,8 +2481,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootprefix=$$dc_install_base/$(rootprefix)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
-       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+       cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
+       scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/
 
 git-tag: