X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=452de152dc42ade459126f77c5a6493b46caf28d;hb=45a5ff0de744bc73a0695e61f749ee983ef97b64;hp=415e0d39eaf5d20f45eb3e42232bc7adbd7082b5;hpb=ff944daa019c1101d6464412e6682732ec11143a;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 415e0d39e..452de152d 100644
--- 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 \
@@ -273,7 +273,6 @@ dist_systemunit_DATA = \
 	units/mail-transfer-agent.target \
 	units/hibernate.target \
 	units/hybrid-sleep.target \
-	units/http-daemon.target \
 	units/poweroff.target \
 	units/reboot.target \
 	units/rescue.target \
@@ -802,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 += \
@@ -1797,8 +1798,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 = \
@@ -1859,6 +1863,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
@@ -3984,7 +3989,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) \
@@ -4004,7 +4009,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