chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: glib-event-glue.c - remove unnecessary includes
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 4d93304cb61c95bb53453aead7c3e5a72059dd40..3800a2235307e22c26f71b486ca00a8606bb5dab 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-39,16
+39,16
@@
SUBDIRS = . po
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=7
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=
0
+LIBUDEV_REVISION=
1
LIBUDEV_AGE=6
LIBGUDEV_CURRENT=2
LIBGUDEV_REVISION=0
LIBGUDEV_AGE=2
LIBUDEV_AGE=6
LIBGUDEV_CURRENT=2
LIBGUDEV_REVISION=0
LIBGUDEV_AGE=2
-LIBSYSTEMD_CURRENT=
4
+LIBSYSTEMD_CURRENT=
5
LIBSYSTEMD_REVISION=0
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=
4
+LIBSYSTEMD_AGE=
5
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
@@
-746,12
+746,14
@@
libsystemd_shared_la_SOURCES = \
src/shared/securebits.h \
src/shared/special.h \
src/shared/list.h \
src/shared/securebits.h \
src/shared/special.h \
src/shared/list.h \
+ src/shared/unaligned.h \
src/shared/macro.h \
src/shared/def.h \
src/shared/sparse-endian.h \
src/shared/refcnt.h \
src/shared/udev-util.h \
src/shared/bus-errors.h \
src/shared/macro.h \
src/shared/def.h \
src/shared/sparse-endian.h \
src/shared/refcnt.h \
src/shared/udev-util.h \
src/shared/bus-errors.h \
+ src/shared/bus-errors.c \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
src/shared/util.c \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
src/shared/util.c \
@@
-768,11
+770,12
@@
libsystemd_shared_la_SOURCES = \
src/shared/time-util.h \
src/shared/locale-util.c \
src/shared/locale-util.h \
src/shared/time-util.h \
src/shared/locale-util.c \
src/shared/locale-util.h \
+ src/shared/mempool.c \
+ src/shared/mempool.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/siphash24.c \
src/shared/siphash24.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/siphash24.c \
src/shared/siphash24.h \
- src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
@@
-879,12
+882,10
@@
libsystemd_shared_la_SOURCES = \
src/shared/copy.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
src/shared/copy.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
- src/shared/memfd.c \
- src/shared/memfd.h \
+ src/shared/memfd
-util
.c \
+ src/shared/memfd
-util
.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
- src/shared/switch-root.h \
- src/shared/switch-root.c \
src/shared/nss-util.h
if HAVE_UTMP
src/shared/nss-util.h
if HAVE_UTMP
@@
-932,6
+933,8
@@
libsystemd_label_la_SOURCES = \
src/shared/mkdir-label.c \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
src/shared/mkdir-label.c \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
+ src/shared/switch-root.h \
+ src/shared/switch-root.c \
src/shared/fileio-label.c \
src/shared/fileio-label.h \
src/shared/dev-setup.c \
src/shared/fileio-label.c \
src/shared/fileio-label.h \
src/shared/dev-setup.c \
@@
-1345,6
+1348,7
@@
tests += \
test-hashmap \
test-set \
test-list \
test-hashmap \
test-set \
test-list \
+ test-unaligned \
test-tables \
test-device-nodes \
test-xml \
test-tables \
test-device-nodes \
test-xml \
@@
-1357,7
+1361,9
@@
tests += \
test-ratelimit \
test-condition-util \
test-uid-range \
test-ratelimit \
test-condition-util \
test-uid-range \
- test-bus-policy
+ test-bus-policy \
+ test-locale-util \
+ test-copy
EXTRA_DIST += \
test/a.service \
EXTRA_DIST += \
test/a.service \
@@
-1501,6
+1507,18
@@
test_async_SOURCES = \
test_async_LDADD = \
libsystemd-shared.la
test_async_LDADD = \
libsystemd-shared.la
+test_locale_util_SOURCES = \
+ src/test/test-locale-util.c
+
+test_locale_util_LDADD = \
+ libsystemd-shared.la
+
+test_copy_SOURCES = \
+ src/test/test-copy.c
+
+test_copy_LDADD = \
+ libsystemd-shared.la
+
test_condition_util_SOURCES = \
src/test/test-condition-util.c
test_condition_util_SOURCES = \
src/test/test-condition-util.c
@@
-1609,6
+1627,12
@@
test_xml_LDADD = \
test_list_SOURCES = \
src/test/test-list.c
test_list_SOURCES = \
src/test/test-list.c
+test_unaligned_LDADD = \
+ libsystemd-core.la
+
+test_unaligned_SOURCES = \
+ src/test/test-unaligned.c
+
test_list_LDADD = \
libsystemd-core.la
test_list_LDADD = \
libsystemd-core.la
@@
-2591,8
+2615,7
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
- src/libsystemd/libsystemd.sym \
- src/libsystemd/sd-bus/bus-error-mapping.c
+ src/libsystemd/libsystemd.sym
libsystemd_internal_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_internal_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-2630,13
+2653,11
@@
noinst_LTLIBRARIES += \
EXTRA_DIST += \
src/libsystemd/libsystemd.sym.m4 \
src/libsystemd/libsystemd.pc.in \
EXTRA_DIST += \
src/libsystemd/libsystemd.sym.m4 \
src/libsystemd/libsystemd.pc.in \
- src/libsystemd/sd-bus/bus-error-mapping.gperf \
src/libsystemd/sd-bus/DIFFERENCES \
src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
CLEANFILES += \
src/libsystemd/sd-bus/DIFFERENCES \
src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
CLEANFILES += \
- src/libsystemd/libsystemd.sym \
- src/libsystemd/sd-bus/bus-error-mapping.c
+ src/libsystemd/libsystemd.sym
BUILT_SOURCES += \
src/libsystemd/libsystemd.sym
BUILT_SOURCES += \
src/libsystemd/libsystemd.sym
@@
-2937,6
+2958,7
@@
libsystemd_network_la_SOURCES = \
src/systemd/sd-icmp6-nd.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-icmp6-nd.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
+ src/systemd/sd-pppoe.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
@@
-2951,6
+2973,7
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
src/libsystemd-network/ipv4ll-internal.h \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/sd-pppoe.c \
src/libsystemd-network/network-internal.c \
src/libsystemd-network/network-internal.h \
src/libsystemd-network/sd-icmp6-nd.c \
src/libsystemd-network/network-internal.c \
src/libsystemd-network/network-internal.h \
src/libsystemd-network/sd-icmp6-nd.c \
@@
-3010,6
+3033,14
@@
test_ipv4ll_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
+test_pppoe_SOURCES = \
+ src/systemd/sd-pppoe.h \
+ src/libsystemd-network/test-pppoe.c
+
+test_pppoe_LDADD = \
+ libsystemd-network.la \
+ libsystemd-shared.la
+
test_icmp6_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
test_icmp6_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
@@
-3039,6
+3070,9
@@
tests += \
test-icmp6-rs \
test-dhcp6-client
test-icmp6-rs \
test-dhcp6-client
+manual_tests += \
+ test-pppoe
+
# ------------------------------------------------------------------------------
if ENABLE_TERMINAL
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
if ENABLE_TERMINAL
noinst_LTLIBRARIES += \
@@
-5398,20
+5432,6
@@
SYSTEM_UNIT_ALIASES += \
BUSNAMES_TARGET_WANTS += \
org.freedesktop.login1.busname
BUSNAMES_TARGET_WANTS += \
org.freedesktop.login1.busname
-if ENABLE_MULTI_SEAT_X
-
-systemd_multi_seat_x_SOURCES = \
- src/login/multi-seat-x.c
-
-systemd_multi_seat_x_LDADD = \
- libsystemd-label.la \
- libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
- systemd-multi-seat-x
-
-endif
-
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
src/login/70-power-switch.rules
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
src/login/70-power-switch.rules
@@
-6260,3
+6280,6
@@
print-%:
git-contrib:
@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
git-contrib:
@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+ tools/gdb-sd_dump_hashmaps.py