hwdb: update name databases

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 620b4d22f054eccec4c1f70de126267b8fb332c9..bf04d318403dcfa476cbf89eab264908f4b339a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,9 +46,9 @@ LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
-LIBSYSTEMD_CURRENT=5
-LIBSYSTEMD_REVISION=1
-LIBSYSTEMD_AGE=5
+LIBSYSTEMD_CURRENT=6
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=6
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -190,6 +190,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+       -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -1433,7 +1434,7 @@ EXTRA_DIST += \
        test/c.service \
        test/daughter.service \
        test/d.service \
-       test/end.service \
+       test/end.service.in \
        test/e.service \
        test/f.service \
        test/grandchild.service \
@@ -3553,13 +3554,14 @@ dist_udevrules_DATA += \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
-       rules/70-mouse.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-serial.rules \
        rules/60-persistent-input.rules \
        rules/60-persistent-alsa.rules \
        rules/60-persistent-storage.rules \
        rules/64-btrfs.rules \
+       rules/70-mouse.rules \
+       rules/70-touchpad.rules \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
@@ -3751,7 +3753,8 @@ dist_udevhwdb_DATA = \
        hwdb/20-OUI.hwdb \
        hwdb/20-net-ifname.hwdb \
        hwdb/60-keyboard.hwdb \
-       hwdb/70-mouse.hwdb
+       hwdb/70-mouse.hwdb \
+       hwdb/70-touchpad.hwdb
 
 EXTRA_DIST += \
        units/systemd-hwdb-update.service.in
@@ -4988,10 +4991,8 @@ BUSNAMES_TARGET_WANTS += \
        org.freedesktop.locale1.busname
 
 dist_pkgdata_DATA += \
-       src/locale/kbd-model-map
-
-dist_noinst_SCRIPT = \
-       src/locale/generate-kbd-model-map
+       src/locale/kbd-model-map \
+       src/locale/language-fallback-map
 
 localectl_SOURCES = \
        src/locale/localectl.c
@@ -5583,13 +5584,16 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-netdev-bond.c \
        src/network/networkd-netdev-bridge.c \
        src/network/networkd-link.c \
+       src/network/networkd-link-bus.c \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
        src/network/networkd-network.c \
+       src/network/networkd-network-bus.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
        src/network/networkd-manager.c \
+       src/network/networkd-manager-bus.c \
        src/network/networkd-fdb.c \
        src/network/networkd-address-pool.c
 
@@ -5664,14 +5668,33 @@ tests += \
        test-network \
        test-network-tables
 
+dist_systemunit_DATA += \
+       units/systemd-networkd.socket
+
 nodist_systemunit_DATA += \
        units/systemd-networkd.service \
        units/systemd-networkd-wait-online.service
 
+dist_systemunit_DATA_busnames += \
+       units/org.freedesktop.network1.busname
+
+dist_dbussystemservice_DATA += \
+       src/network/org.freedesktop.network1.service
+
+dist_dbuspolicy_DATA += \
+       src/network/org.freedesktop.network1.conf
+
 GENERAL_ALIASES += \
+       $(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \
        $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
        $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
 
+SYSTEM_UNIT_ALIASES += \
+       systemd-networkd.service dbus-org.freedesktop.network1.service
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.network1.busname
+
 EXTRA_DIST += \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf \