volume_id: add volume_id_get_* functions

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index d7801296bd7c150319aa76110ef6a562e025aeaa..c4311ddc19b3427ac81b9c67aca41f2dbf98d780 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# Makefile for udev
 #
 # Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
 # Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
@@ -14,10 +13,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 098
+VERSION = 110
 
 # set this to make use of syslog
 USE_LOG = true
@@ -44,7 +43,6 @@ EXTRAS =
 V =
 
 PROGRAMS = \
-       udev                            \
        udevd                           \
        udevtrigger                     \
        udevsettle                      \
@@ -52,6 +50,7 @@ PROGRAMS = \
        udevmonitor                     \
        udevinfo                        \
        udevtest                        \
+       test-udev                       \
        udevstart
 
 HEADERS = \
@@ -102,10 +101,10 @@ configdir =       ${etcdir}/udev
 udevdir =      /dev
 DESTDIR =
 
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL_SCRIPT = ${INSTALL}
 PWD = $(shell pwd)
 
 CROSS_COMPILE ?=
@@ -114,13 +113,13 @@ LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 RANLIB = $(CROSS_COMPILE)ranlib
 
-CFLAGS         = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS         += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 WARNINGS       = -Wstrict-prototypes -Wsign-compare -Wshadow \
                  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
                  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
 CFLAGS         += $(WARNINGS)
 
-LDFLAGS = -Wl,-warn-common
+LDFLAGS += -Wl,-warn-common
 
 OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
@@ -200,7 +199,7 @@ udev_version.h:
        $(Q) echo \#define UDEV_VERSION         \"$(VERSION)\" >> $@
        $(Q) echo \#define UDEV_ROOT            \"$(udevdir)\" >> $@
        $(Q) echo \#define UDEV_CONFIG_FILE     \"$(configdir)/udev.conf\" >> $@
-       $(Q) echo \#define UDEV_RULES_FILE      \"$(configdir)/rules.d\" >> $@
+       $(Q) echo \#define UDEV_RULES_DIR       \"$(configdir)/rules.d\" >> $@
 
 # man pages
 %.8 %.7: %.xml
@@ -227,8 +226,8 @@ clean:
 .PHONY: clean
 
 release:
-       git-tar-tree HEAD udev-$(VERSION) | gzip -9v > udev-$(VERSION).tar.gz
-       git-tar-tree HEAD udev-$(VERSION) | bzip2 -9v > udev-$(VERSION).tar.bz2
+       git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz
+       git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
 .PHONY: release
 
 install-config:
@@ -327,10 +326,10 @@ buildtest:
 
 ChangeLog: Makefile
        @ mv $@ $@.tmp
-       @ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@
+       @ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@
        @ echo "============================================" >> $@
        @ echo >> $@
-       @ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog  >> $@
+       @ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog  >> $@
        @ echo >> $@
        @ cat $@
        @ cat $@.tmp >> $@