chiark / gitweb /
socket-proxyd: Remove datagram research TODO. This proxy will not work with them.
[elogind.git] / Makefile.am
index 05f6f9029129bf995c0f80a9b8a124071c8aecfb..91eb1541fe1dffe36d4b6133383328dd03f2ce30 100644 (file)
@@ -1490,7 +1490,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        $(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -2809,6 +2809,7 @@ journalctl_SOURCES += \
        src/journal/journal-qrcode.h
 
 journalctl_CFLAGS = \
+       $(AM_CFLAGS) \
        $(QRENCODE_CFLAGS)
 
 journalctl_LDADD += \
@@ -2995,7 +2996,7 @@ libsystemd_journal_la_CFLAGS += \
 libsystemd_journal_la_LIBADD += \
        $(XZ_LIBS)
 
-libsystemd_journal_internal_la_CFLAGS = \
+libsystemd_journal_internal_la_CFLAGS += \
        $(XZ_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD += \
@@ -4445,7 +4446,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
-       systemd-fsck-root.service \
        tmp.mount
 MULTI_USER_TARGET_WANTS += \
        getty.target \