chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial: rfkill: It's util.h, not utils.h
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 05f6f9029129bf995c0f80a9b8a124071c8aecfb..a29a32a5d2d5de2f66d62fc419278a5a99d287c8 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1490,7
+1490,7
@@
systemd_update_utmp_CFLAGS = \
systemd_update_utmp_LDADD = \
libsystemd-shared.la \
systemd_update_utmp_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
$(AUDIT_LIBS)
# ------------------------------------------------------------------------------
@@
-2789,6
+2789,8
@@
systemd_cat_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la
libsystemd-shared.la \
libsystemd-journal-internal.la
+journalctl_CFLAGS = $(AM_CFLAGS)
+
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_SOURCES = \
src/journal/journalctl.c
@@
-2808,7
+2810,7
@@
journalctl_SOURCES += \
src/journal/journal-qrcode.c \
src/journal/journal-qrcode.h
src/journal/journal-qrcode.c \
src/journal/journal-qrcode.h
-journalctl_CFLAGS = \
+journalctl_CFLAGS
+
= \
$(QRENCODE_CFLAGS)
journalctl_LDADD += \
$(QRENCODE_CFLAGS)
journalctl_LDADD += \
@@
-2995,7
+2997,7
@@
libsystemd_journal_la_CFLAGS += \
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
-libsystemd_journal_internal_la_CFLAGS = \
+libsystemd_journal_internal_la_CFLAGS
+
= \
$(XZ_CFLAGS)
libsystemd_journal_internal_la_LIBADD += \
$(XZ_CFLAGS)
libsystemd_journal_internal_la_LIBADD += \
@@
-4445,7
+4447,6
@@
SYSINIT_TARGET_WANTS += \
systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
- systemd-fsck-root.service \
tmp.mount
MULTI_USER_TARGET_WANTS += \
getty.target \
tmp.mount
MULTI_USER_TARGET_WANTS += \
getty.target \