X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=42da4fb753ca996cf70f5672b30e5dfff8e257eb;hb=fc7985ed678f2f07cfe941715544e6184981e019;hp=f5cef3f89a8ed0b7c9bcdf688b2d5e1f7437f1b9;hpb=dd338f01f545fd29777d7c1a53c7c658a409cda6;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f5cef3f89..42da4fb75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -974,6 +974,7 @@ systemctl_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
 	libsystemd-journal.la \
+	libsystemd-id128.la \
 	$(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1207,9 +1208,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
 
@@ -1239,7 +1244,8 @@ systemd_journalctl_SOURCES = \
 
 systemd_journalctl_LDADD = \
 	libsystemd-basic.la \
-	libsystemd-journal.la
+	libsystemd-journal.la \
+	libsystemd-id128.la
 
 if HAVE_XZ
 systemd_journalctl_SOURCES += \
@@ -2440,8 +2446,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: