X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=bab1732da4383ffcd4ddf36f0a1df795059014aa;hp=f650233ceeb8c364b4db47d604031c43527236c0;hb=05ec6e7507d159e5a02a82927c6571b7e516c52e;hpb=1ef985452b0247ec32799b64ecabb85cb8ffe473

diff --git a/Makefile b/Makefile
index f650233ce..bab1732da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for udev
 #
 # Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 083
+VERSION = 096
 
 # set this to make use of syslog
 USE_LOG = true
@@ -33,9 +33,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
 
@@ -43,13 +40,14 @@ USE_STATIC = false
 #  make EXTRAS="extras/<extra1> extras/<extra2>"
 EXTRAS =
 
-# make the build silent.
+# make the build silent
 V =
 
 PROGRAMS = \
 	udev				\
 	udevd				\
-	udevsend			\
+	udevtrigger			\
+	udevsettle			\
 	udevcontrol			\
 	udevmonitor			\
 	udevinfo			\
@@ -58,6 +56,7 @@ PROGRAMS = \
 
 HEADERS = \
 	udev.h				\
+	udevd.h				\
 	udev_rules.h			\
 	logging.h			\
 	udev_libc_wrapper.h		\
@@ -67,8 +66,7 @@ HEADERS = \
 UDEV_OBJS = \
 	udev_device.o			\
 	udev_config.o			\
-	udev_add.o			\
-	udev_remove.o			\
+	udev_node.o			\
 	udev_db.o			\
 	udev_sysfs.o			\
 	udev_rules.o			\
@@ -84,7 +82,8 @@ MAN_PAGES = \
 	udev.7				\
 	udevmonitor.8			\
 	udevd.8				\
-	udevsend.8			\
+	udevtrigger.8			\
+	udevsettle.8			\
 	udevtest.8			\
 	udevinfo.8			\
 	udevstart.8
@@ -114,9 +113,6 @@ CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 RANLIB = $(CROSS_COMPILE)ranlib
-HOSTCC = gcc
-STRIP = $(CROSS_COMPILE)strip
-STRIPCMD = $(STRIP) -s
 
 CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
@@ -136,7 +132,6 @@ endif
 # if DEBUG is enabled, then we do not strip
 ifeq ($(strip $(DEBUG)),true)
 	CFLAGS  += -DDEBUG
-	STRIPCMD =
 endif
 
 ifeq ($(strip $(USE_GCOV)),true)
@@ -144,12 +139,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
@@ -176,7 +165,8 @@ all: $(PROGRAMS) $(MAN_PAGES)
 			CFLAGS="$(CFLAGS)" \
 			LD="$(LD)" \
 			LDFLAGS="$(LDFLAGS)" \
-			STRIPCMD="$(STRIPCMD)" \
+			AR="$(AR)" \
+			RANLIB="$(RANLIB)" \
 			LIB_OBJS="$(LIB_OBJS)" \
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
 			-C $$target $@ || exit 1; \
@@ -196,10 +186,6 @@ all: $(PROGRAMS) $(MAN_PAGES)
 $(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
 	$(E) "  LD      " $@
 	$(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(STRIPCMD),)
-	$(E) "  STRIP   " $@
-	$(Q) $(STRIPCMD) $@
-endif
 
 $(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
 	$(Q) rm -f $@
@@ -213,11 +199,11 @@ udev_version.h:
 	$(Q) echo "/* Generated by make. */" > $@
 	$(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_CONFIG_FILE	\"$(configdir)/udev.conf\" >> $@
+	$(Q) echo \#define UDEV_RULES_FILE	\"$(configdir)/rules.d\" >> $@
 
 # man pages
-%.8 %.7: docs/%.xml
+%.8 %.7: %.xml
 	$(E) "  XMLTO   " $@
 	$(Q) xmlto man $?
 .PRECIOUS: %.8
@@ -265,6 +251,8 @@ install-man:
 	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
 	$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
 	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+	$(INSTALL_DATA) -D udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8
+	$(INSTALL_DATA) -D udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8
 	$(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
 	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
 	@extras="$(EXTRAS)"; for target in $$extras; do \
@@ -277,6 +265,8 @@ uninstall-man:
 	- rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevtest.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevd.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevtrigger.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevsettle.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
 	@ extras="$(EXTRAS)"; for target in $$extras; do \
@@ -287,6 +277,8 @@ uninstall-man:
 install-bin:
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
+	$(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
+	$(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle
 	$(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol
 	$(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor
 	$(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
@@ -303,6 +295,8 @@ endif
 
 uninstall-bin:
 	- rm -f $(DESTDIR)$(sbindir)/udevd
+	- rm -f $(DESTDIR)$(sbindir)/udevtrigger
+	- rm -f $(DESTDIR)$(sbindir)/udevsettle
 	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
 	- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
 	- rm -f $(DESTDIR)$(usrbindir)/udevinfo
@@ -343,7 +337,7 @@ ChangeLog: Makefile
 	@ rm $@.tmp
 
 gcov-all:
-	$(MAKE) clean all STRIPCMD= USE_GCOV=true
+	$(MAKE) clean all USE_GCOV=true
 	@ echo
 	@ echo "binaries built with gcov support."
 	@ echo "run the tests and analyze with 'make udev_gcov.txt'"