rules: fix typo

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 563b09b97b362d1fbbdad677c0f08154bef99eb9..340b2e1ce45898a91b4ad668c0ae409da7a943c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = .
 
 EXTRA_DIST = autogen.sh
 
 
 EXTRA_DIST = autogen.sh
 

-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

 
 AM_MAKEFLAGS = --no-print-directory
 
 
 AM_MAKEFLAGS = --no-print-directory
 


@@ -41,9 +41,9 @@ dist_libexec_SCRIPTS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------

-LIBUDEV_CURRENT=12
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=12
+LIBUDEV_CURRENT=13
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=13

 
 SUBDIRS += libudev/docs
 
 
 SUBDIRS += libudev/docs
 


@@ -61,6 +61,7 @@ libudev_libudev_la_SOURCES =\
        libudev/libudev-queue.c
 
 libudev_libudev_la_LDFLAGS = \
        libudev/libudev-queue.c
 
 libudev_libudev_la_LDFLAGS = \

+       $(AM_LDFLAGS) \

        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
 noinst_LTLIBRARIES = \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
 noinst_LTLIBRARIES = \


@@ -151,9 +152,11 @@ INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
 sbin_PROGRAMS = \
 endif
 
 sbin_PROGRAMS = \

-       udev/udevd \

        udev/udevadm
 
        udev/udevadm
 

+libexec_PROGRAMS = \
+       udev/udevd
+

 udev_common_sources =\
        udev/udev.h \
        udev/udev-event.c \
 udev_common_sources =\
        udev/udev.h \
        udev/udev-event.c \


@@ -233,7 +236,7 @@ extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
 extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
 extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules

-libexec_PROGRAMS = extras/firmware/firmware
+libexec_PROGRAMS += extras/firmware/firmware

 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify


@@ -496,6 +499,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/fujitsu-amilo_si_1520 \
        extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
        extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
        extras/keymap/keymaps/fujitsu-amilo_si_1520 \
        extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
        extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \

+       extras/keymap/keymaps/genius-slimstar-320 \

        extras/keymap/keymaps/hewlett-packard \
        extras/keymap/keymaps/hewlett-packard-2510p_2530p \
        extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
        extras/keymap/keymaps/hewlett-packard \
        extras/keymap/keymaps/hewlett-packard-2510p_2530p \
        extras/keymap/keymaps/hewlett-packard-compaq_elitebook \


@@ -676,9 +680,14 @@ git-release:
        head -1 ChangeLog | grep -q "to v$(VERSION)"
        head -1 NEWS | grep -q "udev $(VERSION)"
        git commit -a -m "release $(VERSION)"
        head -1 ChangeLog | grep -q "to v$(VERSION)"
        head -1 NEWS | grep -q "udev $(VERSION)"
        git commit -a -m "release $(VERSION)"

-       git tag $(VERSION)
+       git tag -m "udev $(VERSION)" -s $(VERSION)

        git gc --prune=0
 
        git gc --prune=0
 

+tar:
+       make distcheck
+       gpg --armor --detach-sign udev-$(VERSION).tar.gz
+       gpg --armor --detach-sign udev-$(VERSION).tar.bz2
+

 git-sync:
        git push
        git push --tags $(VERSION)
 git-sync:
        git push
        git push --tags $(VERSION)