update TODO

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9a054ae93526747f9453dad4c6e3ce2296ffec90..53a3bb9f900897e6b02fbe8272bf8e94cbd47bab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,7 +241,7 @@ systemgenerator_PROGRAMS = \
        systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
-       bash-completion/systemd-bash-completion.sh
+       shell-completion/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -798,6 +798,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-ask-password-agent.h \
        src/shared/specifier.c \
        src/shared/specifier.h \
+       src/shared/replace-var.c \
+       src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \
@@ -1182,7 +1184,8 @@ noinst_PROGRAMS += \
        test-log \
        test-unit-file \
        test-date \
-       test-sleep
+       test-sleep \
+       test-replace-var
 
 TESTS += \
        test-job-type \
@@ -1191,7 +1194,8 @@ TESTS += \
        test-unit-name \
        test-unit-file \
        test-date \
-       test-sleep
+       test-sleep \
+       test-replace-var
 
 test_engine_SOURCES = \
        src/test/test-engine.c
@@ -1265,6 +1269,12 @@ test_sleep_SOURCES = \
 test_sleep_LDADD = \
        libsystemd-core.la
 
+test_replace_var_SOURCES = \
+       src/test/test-replace-var.c
+
+test_replace_var_LDADD = \
+       libsystemd-shared.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1798,8 +1808,11 @@ dist_udevrules_DATA += \
 
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-product.hwdb \
+       hwdb/20-pci-classes.hwdb \
        hwdb/20-usb-vendor-product.hwdb \
-       hwdb/20-acpi-vendor.hwdb
+       hwdb/20-usb-classes.hwdb \
+       hwdb/20-acpi-vendor.hwdb \
+       hwdb/20-OUI.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -1860,6 +1873,7 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-hwdb.c \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-kmod.c \
+       src/udev/udev-builtin-net_id.c \
        src/udev/udev-builtin-path_id.c \
        src/udev/udev-builtin-usb_id.c \
        src/libsystemd-daemon/sd-daemon.c
@@ -3985,7 +3999,7 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 clean-local:
        rm -rf $(abs_srcdir)/install-tree
-       rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids
+       rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
@@ -4005,7 +4019,8 @@ endif
 hwdb-update:
        ( cd hwdb && \
        wget -N http://www.linux-usb.org/usb.ids && \
-       wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+       wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
+       wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
        ./ids-update.pl )
 
 upload: all distcheck