X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=0ef15df2020d79c565d0d05dd40dd2fa45049b07;hp=54905512eec227fc31f3c03db810b6f370a7734e;hb=8fdad27d613807a4bfa578e378a4dcae6559399a;hpb=df16b77934bed6c2f146098d60e5ffaf15e591ae

diff --git a/Makefile b/Makefile
index 54905512e..0ef15df20 100644
--- 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 = 093
+VERSION = 104
 
 # 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
 
@@ -47,7 +43,6 @@ EXTRAS =
 V =
 
 PROGRAMS = \
-	udev				\
 	udevd				\
 	udevtrigger			\
 	udevsettle			\
@@ -55,13 +50,15 @@ PROGRAMS = \
 	udevmonitor			\
 	udevinfo			\
 	udevtest			\
+	test-udev			\
 	udevstart
 
 HEADERS = \
 	udev.h				\
+	udevd.h				\
 	udev_rules.h			\
 	logging.h			\
-	udev_libc_wrapper.h		\
+	udev_sysdeps.h			\
 	udev_selinux.h			\
 	list.h
 
@@ -77,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 = \
@@ -93,7 +90,7 @@ MAN_PAGES = \
 GEN_HEADERS = \
 	udev_version.h
 
-prefix =
+prefix ?=
 etcdir =	${prefix}/etc
 sbindir =	${prefix}/sbin
 usrbindir =	${prefix}/usr/bin
@@ -110,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
@@ -141,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
@@ -208,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
@@ -235,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-104/ HEAD | gzip -9v > udev-$(VERSION).tar.gz
+	git-archive --format=tar --prefix=udev-104/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
 .PHONY: release
 
 install-config:
@@ -335,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 >> $@