X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=1b9534c7b8100b18ff14fe95f6d9a1ca9a753093;hp=09511c469345135cb5f11d5649ff9888d4c2a4a5;hb=15ff0ba36e9c1f051fe1e35e69f8569d0dfe2d66;hpb=1a72d06f7be696cf6f6753fdc01c0ff8171240ea

diff --git a/Makefile b/Makefile
index 09511c469..1b9534c7b 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 = 082
+VERSION = 088
 
 # set this to make use of syslog
 USE_LOG = true
@@ -43,12 +43,13 @@ USE_STATIC = false
 #  make EXTRAS="extras/<extra1> extras/<extra2>"
 EXTRAS =
 
-# make the build silent.
-V = false
+# make the build silent
+V =
 
 PROGRAMS = \
 	udev				\
 	udevd				\
+	udevtrigger			\
 	udevsend			\
 	udevcontrol			\
 	udevmonitor			\
@@ -84,6 +85,7 @@ MAN_PAGES = \
 	udev.7				\
 	udevmonitor.8			\
 	udevd.8				\
+	udevtrigger.8			\
 	udevsend.8			\
 	udevtest.8			\
 	udevinfo.8			\
@@ -109,14 +111,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 PWD = $(shell pwd)
 
-CROSS =
-CC = $(CROSS)gcc
-LD = $(CROSS)gcc
-AR = $(CROSS)ar
-RANLIB = $(CROSS)ranlib
+CROSS_COMPILE =
+CC = $(CROSS_COMPILE)gcc
+LD = $(CROSS_COMPILE)gcc
+AR = $(CROSS_COMPILE)ar
+RANLIB = $(CROSS_COMPILE)ranlib
 HOSTCC = gcc
-STRIP = $(CROSS)strip
-STRIPCMD = $(STRIP) -s
 
 CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
@@ -136,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)
@@ -145,10 +144,9 @@ ifeq ($(strip $(USE_GCOV)),true)
 endif
 
 ifeq ($(strip $(USE_KLIBC)),true)
-	KLCC		= /usr/bin/$(CROSS)klcc
+	KLCC		= /usr/bin/$(CROSS_COMPILE)klcc
 	CC		= $(KLCC)
 	LD		= $(KLCC)
-	V = true
 endif
 
 ifeq ($(strip $(USE_SELINUX)),true)
@@ -162,25 +160,23 @@ ifeq ($(strip $(USE_STATIC)),true)
 	LDFLAGS += -static
 endif
 
-ifeq ($(strip $(V)),false)
-	QUIET=@$(PWD)/ccdv
-	HOST_PROGS=ccdv
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
 else
-	QUIET=
-	HOST_PROGS=
+	E = @\#
+	Q =
 endif
+export E Q
 
 all: $(PROGRAMS) $(MAN_PAGES)
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
+	$(Q) extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) CC="$(CC)" \
 			CFLAGS="$(CFLAGS)" \
 			LD="$(LD)" \
 			LDFLAGS="$(LDFLAGS)" \
-			STRIPCMD="$(STRIPCMD)" \
 			LIB_OBJS="$(LIB_OBJS)" \
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
-			QUIET="$(QUIET)" \
 			-C $$target $@ || exit 1; \
 	done;
 .PHONY: all
@@ -190,49 +186,50 @@ all: $(PROGRAMS) $(MAN_PAGES)
 .SUFFIXES:
 
 # build the objects
-%.o: %.c $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS)
-	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+%.o: %.c $(HEADERS) $(GEN_HEADERS)
+	$(E) "  CC      " $@
+	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
 # "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
-	$(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(STRIPCMD),)
-	$(QUIET) $(STRIPCMD) $@
-endif
+$(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
+	$(E) "  LD      " $@
+	$(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
 
-$(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
-	@rm -f $@
-	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
-	$(QUIET) $(RANLIB) $@
+$(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
+	$(Q) rm -f $@
+	$(E) "  AR      " $@
+	$(Q) $(AR) cq $@ $(UDEV_OBJS)
+	$(E) "  RANLIB  " $@
+	$(Q) $(RANLIB) $@
 
 udev_version.h:
-	@echo "/* Generated by make. */" > $@
-	@echo \#define UDEV_VERSION		\"$(VERSION)\" >> $@
-	@echo \#define UDEV_ROOT		\"$(udevdir)\" >> $@
-	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
-	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
+	$(E) "  GENHDR  " $@
+	$(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\" >> $@
 
 # man pages
-%.8 %.7: docs/%.xml
-	xmlto man $?
+%.8 %.7: %.xml
+	$(E) "  XMLTO   " $@
+	$(Q) xmlto man $?
 .PRECIOUS: %.8
 
-ccdv: ccdv.c
-	@$(HOSTCC) -O1 ccdv.c -o ccdv
-.SILENT: ccdv
-
 clean:
-	- rm -f $(HOST_PROGS)
-	- find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print0 | xargs -0rt rm -f
-	- find -name "*.gcno" -print0 | xargs -0rt rm -f
-	- find -name "*.gcda" -print0 | xargs -0rt rm -f
-	- find -name "*.gcov" -print0 | xargs -0rt rm -f
-	- rm -f udev_gcov.txt
-	- rm -f core $(PROGRAMS) $(GEN_HEADERS)
-	- rm -f udev-$(VERSION).tar.gz
-	- rm -f udev-$(VERSION).tar.bz2
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
+	$(E) "  CLEAN   "
+	$(Q) - find . -type f -name '*.orig' -print0 | xargs -0r rm -f
+	$(Q) - find . -type f -name '*.rej' -print0 | xargs -0r rm -f
+	$(Q) - find . -type f -name '*~' -print0 | xargs -0r rm -f
+	$(Q) - find . -type f -name '*.[oas]' -print0 | xargs -0r rm -f
+	$(Q) - find . -type f -name "*.gcno" -print0 | xargs -0r rm -f
+	$(Q) - find . -type f -name "*.gcda" -print0 | xargs -0r rm -f
+	$(Q) - find . -type f -name "*.gcov" -print0 | xargs -0r rm -f
+	$(Q) - rm -f udev_gcov.txt
+	$(Q) - rm -f core $(PROGRAMS) $(GEN_HEADERS)
+	$(Q) - rm -f udev-$(VERSION).tar.gz
+	$(Q) - rm -f udev-$(VERSION).tar.bz2
+	@ extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: clean
@@ -244,16 +241,15 @@ release:
 
 install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
-	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
+	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
+	@ if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
 		echo; \
 		echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
 		echo; \
 	fi
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
+	@ extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: install-config
@@ -263,10 +259,10 @@ 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 udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
 	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
 	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: install-man
@@ -276,10 +272,10 @@ 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/udevmonitor.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
+	@ extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: uninstall-man
@@ -287,12 +283,12 @@ 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 udevcontrol $(DESTDIR)$(sbindir)/udevcontrol
 	$(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor
 	$(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
 	$(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
 	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 ifndef DESTDIR
@@ -304,6 +300,7 @@ endif
 
 uninstall-bin:
 	- rm -f $(DESTDIR)$(sbindir)/udevd
+	- rm -f $(DESTDIR)$(sbindir)/udevtrigger
 	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
 	- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
 	- rm -f $(DESTDIR)$(usrbindir)/udevinfo
@@ -313,7 +310,6 @@ ifndef DESTDIR
 	- rm -rf /dev/.udev
 endif
 	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: uninstall-bin
@@ -345,10 +341,10 @@ ChangeLog: Makefile
 	@ rm $@.tmp
 
 gcov-all:
-	$(MAKE) clean all STRIPCMD= USE_GCOV=true
-	@echo
-	@echo "binaries built with gcov support."
-	@echo "run the tests and analyze with 'make udev_gcov.txt'"
+	$(MAKE) clean all USE_GCOV=true
+	@ echo
+	@ echo "binaries built with gcov support."
+	@ echo "run the tests and analyze with 'make udev_gcov.txt'"
 .PHONY: gcov-all
 
 # see docs/README-gcov_for_udev