hwdb: add IEEE OUI data

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d96500c89db8c5a6b721c00bbb951fd00683394..6c0f0667b8592d015dc717a31e1a6e2b8357af6f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,7 +117,6 @@ udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
@@ -242,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 \
@@ -273,7 +272,7 @@ dist_systemunit_DATA = \
        units/nss-user-lookup.target \
        units/mail-transfer-agent.target \
        units/hibernate.target \
-       units/http-daemon.target \
+       units/hybrid-sleep.target \
        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \
@@ -329,6 +328,7 @@ nodist_systemunit_DATA = \
        units/rescue.service \
        units/user@.service \
        units/systemd-hibernate.service \
+       units/systemd-hybrid-sleep.service \
        units/systemd-suspend.service \
        units/systemd-halt.service \
        units/systemd-poweroff.service \
@@ -379,6 +379,7 @@ EXTRA_DIST += \
        units/systemd-udev-settle.service \
        units/debug-shell.service.in \
        units/systemd-hibernate.service.in \
+       units/systemd-hybrid-sleep.service.in \
        units/systemd-suspend.service.in \
        units/quotaon.service.in \
        introspect.awk \
@@ -534,6 +535,7 @@ MANPAGES_ALIAS = \
        man/systemd-shutdownd.socket.8 \
        man/systemd-shutdownd.8 \
        man/systemd-hibernate.service.8 \
+       man/systemd-hybrid-sleep.service.8 \
        man/systemd-sleep.8 \
        man/systemd-shutdown.8 \
        man/systemd-poweroff.service.8 \
@@ -608,6 +610,7 @@ man/systemd-initctl.8: man/systemd-initctl.service.8
 man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
 man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
 man/systemd-hibernate.service.8: man/systemd-suspend.service.8
+man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
 man/systemd-sleep.8: man/systemd-suspend.service.8
 man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
@@ -798,7 +801,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \
-       src/shared/hwclock.h
+       src/shared/hwclock.h \
+       src/shared/time-dst.c \
+       src/shared/time-dst.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1176,7 +1181,8 @@ noinst_PROGRAMS += \
        test-unit-name \
        test-log \
        test-unit-file \
-       test-date
+       test-date \
+       test-sleep
 
 TESTS += \
        test-job-type \
@@ -1184,7 +1190,8 @@ TESTS += \
        test-strv \
        test-unit-name \
        test-unit-file \
-       test-date
+       test-date \
+       test-sleep
 
 test_engine_SOURCES = \
        src/test/test-engine.c
@@ -1252,6 +1259,12 @@ test_date_SOURCES = \
 test_date_LDADD = \
        libsystemd-core.la
 
+test_sleep_SOURCES = \
+       src/test/test-sleep.c
+
+test_sleep_LDADD = \
+       libsystemd-core.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1786,7 +1799,8 @@ dist_udevrules_DATA += \
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-product.hwdb \
        hwdb/20-usb-vendor-product.hwdb \
-       hwdb/20-acpi-vendor.hwdb
+       hwdb/20-acpi-vendor.hwdb \
+       hwdb/20-OUI-vendor.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -3972,7 +3986,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) \
@@ -3993,6 +4007,7 @@ 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://standards.ieee.org/develop/regauth/oui/oui.txt && \
        ./ids-update.pl )
 
 upload: all distcheck