chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck-root: only run when requested in fstab
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 196efe10b87fad9d5951099d478addeab0ab805c..a29a32a5d2d5de2f66d62fc419278a5a99d287c8 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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 += \
@@
-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 \