chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "build-sys: move journalctl CFLAGS= to one line"
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index d2ed1dc1d4847cb09eba8fd7488615b8e42e7ddb..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 \
@@
-806,9
+806,6
@@
libsystemd_logs_la_SOURCES = \
src/shared/logs-show.c \
src/shared/logs-show.h
src/shared/logs-show.c \
src/shared/logs-show.h
-libsystemd_logs_la_CFLAGS = \
- $(AM_CFLAGS)
-
libsystemd_logs_la_LIBADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd_logs_la_LIBADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
@@
-1253,36
+1250,24
@@
test_unit_file_LDADD = \
test_utf8_SOURCES = \
src/test/test-utf8.c
test_utf8_SOURCES = \
src/test/test-utf8.c
-test_utf8_CFLAGS = \
- $(AM_CFLAGS)
-
test_utf8_LDADD = \
libsystemd-shared.la
test_util_SOURCES = \
src/test/test-util.c
test_utf8_LDADD = \
libsystemd-shared.la
test_util_SOURCES = \
src/test/test-util.c
-test_util_CFLAGS = \
- $(AM_CFLAGS)
-
test_util_LDADD = \
libsystemd-core.la
test_hashmap_SOURCES = \
src/test/test-hashmap.c
test_util_LDADD = \
libsystemd-core.la
test_hashmap_SOURCES = \
src/test/test-hashmap.c
-test_hashmap_CFLAGS = \
- $(AM_CFLAGS)
-
test_hashmap_LDADD = \
libsystemd-core.la
test_list_SOURCES = \
src/test/test-list.c
test_hashmap_LDADD = \
libsystemd-core.la
test_list_SOURCES = \
src/test/test-list.c
-test_list_CFLAGS = \
- $(AM_CFLAGS)
-
test_list_LDADD = \
libsystemd-core.la
test_list_LDADD = \
libsystemd-core.la
@@
-1301,27
+1286,18
@@
test_tables_LDADD = \
test_prioq_SOURCES = \
src/test/test-prioq.c
test_prioq_SOURCES = \
src/test/test-prioq.c
-test_prioq_CFLAGS = \
- $(AM_CFLAGS)
-
test_prioq_LDADD = \
libsystemd-core.la
test_fileio_SOURCES = \
src/test/test-fileio.c
test_prioq_LDADD = \
libsystemd-core.la
test_fileio_SOURCES = \
src/test/test-fileio.c
-test_fileio_CFLAGS = \
- $(AM_CFLAGS)
-
test_fileio_LDADD = \
libsystemd-core.la
test_time_SOURCES = \
src/test/test-time.c
test_fileio_LDADD = \
libsystemd-core.la
test_time_SOURCES = \
src/test/test-time.c
-test_time_CFLAGS = \
- $(AM_CFLAGS)
-
test_time_LDADD = \
libsystemd-core.la
test_time_LDADD = \
libsystemd-core.la
@@
-1501,7
+1477,7
@@
systemd_initctl_CFLAGS = \
systemd_initctl_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
systemd_initctl_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-
d
bus.la
+ libsystemd-bus.la
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
# ------------------------------------------------------------------------------
systemd_update_utmp_SOURCES = \
@@
-1514,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)
# ------------------------------------------------------------------------------
@@
-1801,7
+1777,7
@@
systemd_cgroups_agent_CFLAGS = \
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la \
systemd_cgroups_agent_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la
+ libsystemd-bus.la
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
# ------------------------------------------------------------------------------
systemctl_SOURCES = \
@@
-2078,9
+2054,6
@@
test_bus_objects_LDADD = \
test_bus_match_SOURCES = \
src/libsystemd-bus/test-bus-match.c
test_bus_match_SOURCES = \
src/libsystemd-bus/test-bus-match.c
-test_bus_match_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_match_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_match_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
@@
-2089,9
+2062,6
@@
test_bus_match_LDADD = \
test_bus_kernel_SOURCES = \
src/libsystemd-bus/test-bus-kernel.c
test_bus_kernel_SOURCES = \
src/libsystemd-bus/test-bus-kernel.c
-test_bus_kernel_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_kernel_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_kernel_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
@@
-2100,9
+2070,6
@@
test_bus_kernel_LDADD = \
test_bus_kernel_bloom_SOURCES = \
src/libsystemd-bus/test-bus-kernel-bloom.c
test_bus_kernel_bloom_SOURCES = \
src/libsystemd-bus/test-bus-kernel-bloom.c
-test_bus_kernel_bloom_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_kernel_bloom_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_kernel_bloom_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
@@
-2111,9
+2078,6
@@
test_bus_kernel_bloom_LDADD = \
test_bus_kernel_benchmark_SOURCES = \
src/libsystemd-bus/test-bus-kernel-benchmark.c
test_bus_kernel_benchmark_SOURCES = \
src/libsystemd-bus/test-bus-kernel-benchmark.c
-test_bus_kernel_benchmark_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_kernel_benchmark_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
test_bus_kernel_benchmark_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la \
@@
-2122,9
+2086,6
@@
test_bus_kernel_benchmark_LDADD = \
test_bus_memfd_SOURCES = \
src/libsystemd-bus/test-bus-memfd.c
test_bus_memfd_SOURCES = \
src/libsystemd-bus/test-bus-memfd.c
-test_bus_memfd_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_memfd_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
test_bus_memfd_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
@@
-2132,9
+2093,6
@@
test_bus_memfd_LDADD = \
test_bus_zero_copy_SOURCES = \
src/libsystemd-bus/test-bus-zero-copy.c
test_bus_zero_copy_SOURCES = \
src/libsystemd-bus/test-bus-zero-copy.c
-test_bus_zero_copy_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_zero_copy_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
test_bus_zero_copy_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
@@
-2142,9
+2100,6
@@
test_bus_zero_copy_LDADD = \
test_bus_introspect_SOURCES = \
src/libsystemd-bus/test-bus-introspect.c
test_bus_introspect_SOURCES = \
src/libsystemd-bus/test-bus-introspect.c
-test_bus_introspect_CFLAGS = \
- $(AM_CFLAGS)
-
test_bus_introspect_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
test_bus_introspect_LDADD = \
libsystemd-shared.la \
libsystemd-bus.la
@@
-2834,12
+2789,11
@@
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
-journalctl_CFLAGS = \
- $(AM_CFLAGS)
-
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la \
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la \
@@
-3215,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 \
@@
-3226,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 = \
@@
-3726,9
+3677,6
@@
libnss_myhostname_la_SOURCES = \
src/nss-myhostname/ifconf.h \
src/nss-myhostname/netlink.c
src/nss-myhostname/ifconf.h \
src/nss-myhostname/netlink.c
-libnss_myhostname_la_CFLAGS = \
- $(AM_CFLAGS)
-
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
-module \
@@
-4499,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 \