chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import: improve logging a bit
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 20f760c5b694aeda15bac2ae242910a8eab375bd..f165042cb02bd31dca62bcc67183c98d9ed816c0 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-149,6
+149,7
@@
check_DATA =
tests=
manual_tests =
if ENABLE_TESTS
tests=
manual_tests =
if ENABLE_TESTS
+export PYTHON
noinst_PROGRAMS = $(manual_tests) $(tests)
TESTS = $(tests)
else
noinst_PROGRAMS = $(manual_tests) $(tests)
TESTS = $(tests)
else
@@
-368,6
+369,7
@@
bin_PROGRAMS = \
systemd-delta \
systemd-analyze \
systemd-run \
systemd-delta \
systemd-analyze \
systemd-run \
+ systemd-stdio-bridge \
systemd-path
dist_bin_SCRIPTS = \
systemd-path
dist_bin_SCRIPTS = \
@@
-391,7
+393,6
@@
rootlibexec_PROGRAMS = \
systemd-sysctl \
systemd-sleep \
systemd-bus-proxyd \
systemd-sysctl \
systemd-sleep \
systemd-bus-proxyd \
- systemd-stdio-bridge \
systemd-socket-proxyd \
systemd-update-done
systemd-socket-proxyd \
systemd-update-done
@@
-2692,6
+2693,10
@@
libsystemd_proxy_la_SOURCES = \
src/bus-proxyd/synthesize.c \
src/bus-proxyd/synthesize.h
src/bus-proxyd/synthesize.c \
src/bus-proxyd/synthesize.h
+libsystemd_proxy_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
libsystemd_proxy_la_LIBADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd_proxy_la_LIBADD = \
libsystemd-internal.la \
libsystemd-shared.la
@@
-2699,6
+2704,10
@@
libsystemd_proxy_la_LIBADD = \
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c
+systemd_bus_proxyd_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
systemd_bus_proxyd_LDADD = \
libsystemd-proxy.la \
libsystemd-internal.la \
systemd_bus_proxyd_LDADD = \
libsystemd-proxy.la \
libsystemd-internal.la \
@@
-2714,24
+2723,24
@@
systemd_stdio_bridge_LDADD = \
if ENABLE_KDBUS
nodist_systemunit_DATA += \
if ENABLE_KDBUS
nodist_systemunit_DATA += \
- units/systemd-bus-proxyd
@
.service
+ units/systemd-bus-proxyd.service
dist_systemunit_DATA += \
units/systemd-bus-proxyd.socket
nodist_userunit_DATA += \
dist_systemunit_DATA += \
units/systemd-bus-proxyd.socket
nodist_userunit_DATA += \
- units/user/systemd-bus-proxyd
@
.service
+ units/user/systemd-bus-proxyd.service
dist_userunit_DATA += \
units/user/systemd-bus-proxyd.socket
endif
EXTRA_DIST += \
dist_userunit_DATA += \
units/user/systemd-bus-proxyd.socket
endif
EXTRA_DIST += \
- units/systemd-bus-proxyd
@
.service.m4.in \
- units/user/systemd-bus-proxyd
@
.service.in
+ units/systemd-bus-proxyd.service.m4.in \
+ units/user/systemd-bus-proxyd.service.in
CLEANFILES += \
CLEANFILES += \
- units/systemd-bus-proxyd
@
.service.m4
+ units/systemd-bus-proxyd.service.m4
if HAVE_SMACK
bus-proxyd-set-cap-hook:
if HAVE_SMACK
bus-proxyd-set-cap-hook:
@@
-5237,8
+5246,14
@@
systemd_import_SOURCES = \
src/import/import.c \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import.c \
src/import/import-raw.c \
src/import/import-raw.h \
+ src/import/import-tar.c \
+ src/import/import-tar.h \
src/import/import-dkr.c \
src/import/import-dkr.h \
src/import/import-dkr.c \
src/import/import-dkr.h \
+ src/import/import-job.c \
+ src/import/import-job.h \
+ src/import/import-util.c \
+ src/import/import-util.h \
src/import/curl-util.c \
src/import/curl-util.h \
src/import/aufs-util.c \
src/import/curl-util.c \
src/import/curl-util.h \
src/import/aufs-util.c \
@@
-5277,6
+5292,7
@@
test_qcow2_CFLAGS = \
test_qcow2_LDADD = \
libsystemd-internal.la \
test_qcow2_LDADD = \
libsystemd-internal.la \
+ libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
endif
libsystemd-shared.la \
$(ZLIB_LIBS)
endif
@@
-5472,6
+5488,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev-vxlan.h \
src/network/networkd-netdev-vlan.h \
src/network/networkd-netdev-macvlan.h \
src/network/networkd-netdev-vxlan.h \
src/network/networkd-netdev-vlan.h \
src/network/networkd-netdev-macvlan.h \
+ src/network/networkd-netdev-ipvlan.h \
src/network/networkd-netdev-dummy.h \
src/network/networkd-netdev-tuntap.h \
src/network/networkd-netdev-bond.h \
src/network/networkd-netdev-dummy.h \
src/network/networkd-netdev-tuntap.h \
src/network/networkd-netdev-bond.h \
@@
-5482,6
+5499,7
@@
libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-netdev-vxlan.c \
src/network/networkd-netdev-vlan.c \
src/network/networkd-netdev-macvlan.c \
src/network/networkd-netdev-vxlan.c \
src/network/networkd-netdev-vlan.c \
src/network/networkd-netdev-macvlan.c \
+ src/network/networkd-netdev-ipvlan.c \
src/network/networkd-netdev-dummy.c \
src/network/networkd-netdev-tuntap.c \
src/network/networkd-netdev-bond.c \
src/network/networkd-netdev-dummy.c \
src/network/networkd-netdev-tuntap.c \
src/network/networkd-netdev-bond.c \