man: fix typo in tmpfiles.d

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 42c481ed797124d586bcb6fa5d9fe08c9205a3b5..a9666fa157111a0e7d6498d162626bc951fb34c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=5
+LIBUDEV_REVISION=6
 LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
@@ -35,7 +35,7 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=8
+LIBSYSTEMD_LOGIN_REVISION=9
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -43,12 +43,12 @@ LIBSYSTEMD_DAEMON_REVISION=5
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=14
+LIBSYSTEMD_ID128_REVISION=15
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=5
-LIBSYSTEMD_JOURNAL_REVISION=4
-LIBSYSTEMD_JOURNAL_AGE=5
+LIBSYSTEMD_JOURNAL_CURRENT=6
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=6
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -80,6 +80,7 @@ systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
+udevhwdbdir = $(udevlibexecdir)/hwdb.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -746,6 +747,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/list.h \
        src/shared/macro.h \
        src/shared/def.h \
+       src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/virt.c \
@@ -758,6 +760,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/set.h \
        src/shared/strv.c \
        src/shared/strv.h \
+       src/shared/strbuf.c \
+       src/shared/strbuf.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
        src/shared/log.c \
@@ -1755,6 +1759,7 @@ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
 
 udev-confdirs:
        -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
+       -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -1774,6 +1779,10 @@ dist_udevrules_DATA += \
        rules/80-drivers.rules \
        rules/95-udev-late.rules
 
+dist_udevhwdb_DATA = \
+       hwdb/20-pci-vendor-product.hwdb \
+       hwdb/20-usb-vendor-product.hwdb
+
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
        src/udev/udev.conf
@@ -1821,6 +1830,7 @@ noinst_LTLIBRARIES += \
 
 libudev_core_la_SOURCES = \
        src/udev/udev.h \
+       src/udev/udev-hwdb.h \
        src/udev/udev-event.c \
        src/udev/udev-watch.c \
        src/udev/udev-node.c \
@@ -1851,8 +1861,7 @@ libudev_core_la_LIBADD = \
 
 libudev_core_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
-       -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+       -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 
 if HAVE_ACL
 libudev_core_la_SOURCES += \
@@ -1875,6 +1884,7 @@ udevadm_SOURCES = \
        src/udev/udevadm-info.c \
        src/udev/udevadm-control.c \
        src/udev/udevadm-monitor.c \
+       src/udev/udevadm-hwdb.c \
        src/udev/udevadm-settle.c \
        src/udev/udevadm-trigger.c \
        src/udev/udevadm-test.c \
@@ -2533,7 +2543,6 @@ libsystemd_journal_la_SOURCES = \
        src/journal/lookup3.c \
        src/journal/lookup3.h \
        src/journal/journal-send.c \
-       src/journal/sparse-endian.h \
        src/journal/journal-def.h \
        src/journal/compress.h \
        src/journal/mmap-cache.c \
@@ -3183,8 +3192,8 @@ localectl_LDADD = \
 bin_PROGRAMS += \
        localectl
 
-#MANPAGES += \
-#      man/localectl.1
+MANPAGES += \
+       man/localectl.1
 
 endif
 
@@ -3779,6 +3788,10 @@ EXTRA_DIST += \
        docs/sysvinit/README.in \
        docs/var-log/README.in
 
+CLEANFILES += \
+       docs/sysvinit/README \
+       docs/var-log/README
+
 endif
 
 
@@ -3945,8 +3958,10 @@ 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
 
 DISTCHECK_CONFIGURE_FLAGS = \
+       --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
@@ -3960,6 +3975,12 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
 endif
 
+hwdb-update:
+       ( cd hwdb && \
+       wget -N http://www.linux-usb.org/usb.ids && \
+       wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+       ./ids-update.pl )
+
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/