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 4a399c523619c131d85076c4d5235a19b642daec..a29a32a5d2d5de2f66d62fc419278a5a99d287c8 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-299,8
+299,7
@@
bin_PROGRAMS = \
systemd-detect-virt \
systemd-delta \
systemd-analyze \
systemd-detect-virt \
systemd-delta \
systemd-analyze \
- systemd-run \
- systemd-saproxy
+ systemd-run
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@@
-321,7
+320,8
@@
rootlibexec_PROGRAMS = \
systemd-fsck \
systemd-ac-power \
systemd-sysctl \
systemd-fsck \
systemd-ac-power \
systemd-sysctl \
- systemd-sleep
+ systemd-sleep \
+ systemd-socket-proxyd
systemgenerator_PROGRAMS = \
systemd-getty-generator \
systemgenerator_PROGRAMS = \
systemd-getty-generator \
@@
-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 += \
@@
-3167,10
+3169,10
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
-systemd_s
aproxy
_SOURCES = \
- src/s
aproxy/saproxy
.c
+systemd_s
ocket_proxyd
_SOURCES = \
+ src/s
ocket-proxy/socket-proxyd
.c
-systemd_s
aproxy
_LDADD = \
+systemd_s
ocket_proxyd
_LDADD = \
libsystemd-shared.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
libsystemd-shared.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
@@
-3178,9
+3180,6
@@
systemd_saproxy_LDADD = \
libsystemd-daemon.la \
libsystemd-bus.la
libsystemd-daemon.la \
libsystemd-bus.la
-systemd_saproxy_CFLAGS = \
- $(AM_CFLAGS)
-
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_SOURCES = \
@@
-4448,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 \