X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=1e6dd55ee98596476a3b636cbf1bd6de86acb9ff;hb=420a506ef00b011ddb50249c0c53c07cbc37e04c;hp=4b312806eb78881a7c68f23746d369b3f0d917d3;hpb=fa5c98ab9c9fa86e7078011c6c95597b74be2103;p=elogind.git

diff --git a/Makefile b/Makefile
index 4b312806e..1e6dd55ee 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ EXTRAS=
 # make the build silent. Set this to something else to make it noisy again.
 V=false
 
-VERSION =	064
+VERSION =	068
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
@@ -49,6 +49,7 @@ COMPILE =	udevrulescompile
 INITSENDER =	udevinitsend
 RECORDER =	udeveventrecorder
 CONTROL =	udevcontrol
+MONITOR =	udevmonitor
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
@@ -63,6 +64,7 @@ exec_prefix =	${prefix}
 etcdir =	${prefix}/etc
 sbindir =	${exec_prefix}/sbin
 usrbindir =	${exec_prefix}/usr/bin
+usrsbindir =	${exec_prefix}/usr/sbin
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev
 srcdir = .
@@ -105,11 +107,11 @@ GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
 # check if compiler option is supported
 cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
 
-CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
-CFLAGS		+= $(call cc-supports, -Wno-pointer-sign, )
+CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \
+		   -Wstrict-prototypes -Wsign-compare
 CFLAGS		+= $(call cc-supports, -Wdeclaration-after-statement, )
 CFLAGS		+= -pipe
-CFLAGS		+= -D_GNU_SOURCE
+CFLAGS		+= -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 
 # use '-Os' optimization if available, else use -O2
 OPTFLAGS := $(call cc-supports, -Os, -O2)
@@ -135,7 +137,6 @@ SYSFS_OBJS = \
 	libsysfs/dlist.o
 
 UDEV_OBJS = \
-	udev_utils.o			\
 	udev_event.o			\
 	udev_device.o			\
 	udev_config.o			\
@@ -145,6 +146,10 @@ UDEV_OBJS = \
 	udev_db.o			\
 	udev_rules.o			\
 	udev_rules_parse.o		\
+	udev_utils.o			\
+	udev_utils_string.o		\
+	udev_utils_file.o		\
+	udev_utils_run.o		\
 	udev_libc_wrapper.o
 
 OBJS = \
@@ -153,6 +158,13 @@ OBJS = \
 
 SYSFS = $(PWD)/libsysfs/sysfs.a
 
+MAN_PAGES = \
+	udevmonitor.8				\
+	udevd.8				\
+	udevtest.8			\
+	udevinfo.8			\
+	udevstart.8
+
 CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
 		-I$(PWD)/libsysfs
 
@@ -204,7 +216,7 @@ endif
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
 
-all: $(ROOT) $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) \
+all: $(ROOT) $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(MONITOR)\
 	$(DAEMON) $(COMPILE) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -257,11 +269,9 @@ udev_version.h:
 $(LOCAL_CFG_DIR)/udev.conf:
 	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
-GEN_MANPAGES   = udev.8
-GEN_MANPAGESIN = udev.8.in
-# Rules on how to create the man pages
-$(GEN_MANPAGES): $(GEN_MANPAGESIN)
-	sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
+# man pages
+%.8: docs/%.xml
+	xmlto man $?
 
 $(UDEV_OBJS): $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(SYSFS_OBJS): $(HEADERS) $(HOST_PROGS) $(KLCC)
@@ -275,9 +285,10 @@ $(COMPILE).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(INITSENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(RECORDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(CONTROL).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(MONITOR).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 $(STARTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 
-$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
+$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(MAN_PAGES)
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
 
@@ -313,6 +324,10 @@ $(CONTROL): $(KLCC) $(CONTROL).o $(OBJS) udevd.h
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CONTROL).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
 
+$(MONITOR): $(KLCC) $(MONITOR).o $(OBJS) udevd.h
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(MONITOR).o $(OBJS) $(LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
+
 $(STARTER): $(KLCC) $(STARTER).o $(OBJS)
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
@@ -323,8 +338,8 @@ $(STARTER): $(KLCC) $(STARTER).o $(OBJS)
 clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
-	 $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(TESTER) $(STARTER)
+	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(INFO) $(DAEMON) \
+	 $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(MONITOR) $(TESTER) $(STARTER)
 	-rm -f ccdv
 	$(MAKE) -C klibc SUBDIRS=klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -348,8 +363,9 @@ install-config:
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
 	fi
 	@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
+		echo ; \
+		echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
+		echo ; \
 	fi
 
 install-man:
@@ -358,7 +374,9 @@ install-man:
 	$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
 	$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
 	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+	$(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
 	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
+	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
 
 uninstall-man:
 	- rm $(mandir)/man8/udev.8
@@ -366,7 +384,9 @@ uninstall-man:
 	- rm $(mandir)/man8/udevtest.8
 	- rm $(mandir)/man8/udevstart.8
 	- rm $(mandir)/man8/udevd.8
+	- rm $(mandir)/man8/udevmonitor.8
 	- rm $(mandir)/man8/udevsend.8
+	- rm $(mandir)/man8/udevcontrol.8
 
 install: install-config install-man all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
@@ -374,6 +394,7 @@ install: install-config install-man all
 	$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
 	$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
 	$(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
+	$(INSTALL_PROGRAM) -D $(MONITOR) $(DESTDIR)$(usrsbindir)/$(MONITOR)
 	$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
 	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
 	$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
@@ -400,6 +421,7 @@ uninstall: uninstall-man
 	- rm $(sbindir)/$(RECORDER)
 	- rm $(sbindir)/$(CONTROL)
 	- rm $(sbindir)/$(STARTER)
+	- rm $(usrsbindir)/$(MONITOR)
 	- rm $(usrbindir)/$(INFO)
 	- rm $(usrbindir)/$(TESTER)
 	- rm -rf $(udevdb)