X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=42c2bf23dc371c21f35a1dc6947a87a8c07c0910;hp=ddb74175ce94281ba2bdf602f754a73b2f163632;hb=00a074480e4ab15e61f13f8791015fa0befcadce;hpb=0d5be398ffd2f47e0b97f33ca2fd96319ee16c9d

diff --git a/Makefile b/Makefile
index ddb74175c..42c2bf23d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 087
+VERSION = 089
 
 # set this to make use of syslog
 USE_LOG = true
@@ -50,6 +50,7 @@ PROGRAMS = \
 	udev				\
 	udevd				\
 	udevtrigger			\
+	udevsettle			\
 	udevsend			\
 	udevcontrol			\
 	udevmonitor			\
@@ -68,8 +69,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			\
@@ -86,6 +86,7 @@ MAN_PAGES = \
 	udevmonitor.8			\
 	udevd.8				\
 	udevtrigger.8			\
+	udevsettle.8			\
 	udevsend.8			\
 	udevtest.8			\
 	udevinfo.8			\
@@ -116,9 +117,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 \
@@ -138,7 +136,6 @@ endif
 # if DEBUG is enabled, then we do not strip
 ifeq ($(strip $(DEBUG)),true)
 	CFLAGS  += -DDEBUG
-	STRIPCMD =
 endif
 
 ifeq ($(strip $(USE_GCOV)),true)
@@ -178,7 +175,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; \
@@ -198,10 +196,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 $@
@@ -268,6 +262,7 @@ install-man:
 	$(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 \
@@ -281,6 +276,7 @@ uninstall-man:
 	- 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 \
@@ -292,6 +288,7 @@ 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
@@ -309,6 +306,7 @@ 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
@@ -349,7 +347,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'"