scsi_id: remove trailing garbage from ID_SERIAL_SHORT

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index c04742507a18465d8975e404426f7778637fdd1f..947eacaf4407c1b0c5966e1b487dabc7d8fdaa7a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-# Makefile for udev
 #
-# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
 # Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -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 = 091
+VERSION = 103
 
 # set this to make use of syslog
 USE_LOG = true
@@ -33,9 +32,6 @@ USE_GCOV = false
 # include Security-Enhanced Linux support
 USE_SELINUX = false
 
-# comile with klibc instead of glibc
-USE_KLIBC = false
-
 # set this to create statically linked binaries
 USE_STATIC = false
 
@@ -51,7 +47,6 @@ PROGRAMS = \
        udevd                           \
        udevtrigger                     \
        udevsettle                      \
-       udevsend                        \
        udevcontrol                     \
        udevmonitor                     \
        udevinfo                        \
@@ -60,9 +55,10 @@ PROGRAMS = \
 
 HEADERS = \
        udev.h                          \
+       udevd.h                         \
        udev_rules.h                    \
        logging.h                       \
-       udev_libc_wrapper.h             \
+       udev_sysdeps.h                  \
        udev_selinux.h                  \
        list.h
 
@@ -78,7 +74,7 @@ UDEV_OBJS = \
        udev_utils_string.o             \
        udev_utils_file.o               \
        udev_utils_run.o                \
-       udev_libc_wrapper.o
+       udev_sysdeps.o
 LIBUDEV = libudev.a
 
 MAN_PAGES = \
@@ -87,7 +83,6 @@ MAN_PAGES = \
        udevd.8                         \
        udevtrigger.8                   \
        udevsettle.8                    \
-       udevsend.8                      \
        udevtest.8                      \
        udevinfo.8                      \
        udevstart.8
@@ -95,7 +90,7 @@ MAN_PAGES = \
 GEN_HEADERS = \
        udev_version.h
 
-prefix =
+prefix ?=
 etcdir =       ${prefix}/etc
 sbindir =      ${prefix}/sbin
 usrbindir =    ${prefix}/usr/bin
@@ -112,7 +107,7 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 PWD = $(shell pwd)
 
-CROSS_COMPILE =
+CROSS_COMPILE ?=
 CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
@@ -143,12 +138,6 @@ ifeq ($(strip $(USE_GCOV)),true)
        LDFLAGS += -fprofile-arcs
 endif
 
-ifeq ($(strip $(USE_KLIBC)),true)
-       KLCC            = /usr/bin/$(CROSS_COMPILE)klcc
-       CC              = $(KLCC)
-       LD              = $(KLCC)
-endif
-
 ifeq ($(strip $(USE_SELINUX)),true)
        UDEV_OBJS += udev_selinux.o
        LIB_OBJS += -lselinux -lsepol
@@ -337,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 >> $@