X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=7618d0f7fd09075025c9f1edeb5b85479df074ec;hp=a8f2851cabd2eb68d8c26eaef7be69de13f09590;hb=cfb7ac2b5b3ff38cd9be8a515eaa31696cca7941;hpb=8365854ccda3d0f36333b699454238cff111e169

diff --git a/Makefile b/Makefile
index a8f2851ca..7618d0f7f 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 =	063
+VERSION =	065
 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
@@ -105,44 +106,46 @@ 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)
 
 HEADERS = \
-	udev.h			\
-	udev_utils.h		\
-	udev_rules.h		\
-	udev_version.h		\
-	udev_db.h		\
-	udev_sysfs.h		\
-	logging.h		\
-	udev_libc_wrapper.h	\
-	udev_selinux.h		\
+	udev.h				\
+	udev_utils.h			\
+	udev_rules.h			\
+	udev_version.h			\
+	udev_db.h			\
+	udev_sysfs.h			\
+	logging.h			\
+	udev_libc_wrapper.h		\
+	udev_selinux.h			\
 	list.h
 
 SYSFS_OBJS = \
-	libsysfs/sysfs_class.o	\
-	libsysfs/sysfs_device.o	\
-	libsysfs/sysfs_dir.o	\
-	libsysfs/sysfs_driver.o	\
-	libsysfs/sysfs_utils.o	\
+	libsysfs/sysfs_class.o		\
+	libsysfs/sysfs_device.o		\
+	libsysfs/sysfs_dir.o		\
+	libsysfs/sysfs_driver.o		\
+	libsysfs/sysfs_utils.o		\
 	libsysfs/dlist.o
 
 UDEV_OBJS = \
-	udev_utils.o		\
-	udev_config.o		\
-	udev_add.o		\
-	udev_remove.o		\
-	udev_sysfs.o		\
-	udev_db.o		\
-	udev_rules.o		\
-	udev_rules_parse.o	\
+	udev_utils.o			\
+	udev_event.o			\
+	udev_device.o			\
+	udev_config.o			\
+	udev_add.o			\
+	udev_remove.o			\
+	udev_sysfs.o			\
+	udev_db.o			\
+	udev_rules.o			\
+	udev_rules_parse.o		\
 	udev_libc_wrapper.o
 
 OBJS = \
@@ -151,7 +154,7 @@ OBJS = \
 
 SYSFS = $(PWD)/libsysfs/sysfs.a
 
-CFLAGS +=	-I$(PWD)/libsysfs/sysfs \
+CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
 		-I$(PWD)/libsysfs
 
 ifeq ($(strip $(USE_LOG)),true)
@@ -202,7 +205,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 ; \
@@ -273,6 +276,7 @@ $(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)
@@ -311,6 +315,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) $@
@@ -322,7 +330,7 @@ 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)
+	 $(SENDER) $(COMPILE) $(INITSENDER) $(RECORDER) $(CONTROL) $(MONITOR) $(TESTER) $(STARTER)
 	-rm -f ccdv
 	$(MAKE) -C klibc SUBDIRS=klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -372,13 +380,14 @@ 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)$(sbindir)/$(MONITOR)
 	$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
 	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
 	$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
 ifndef DESTDIR
 	- killall $(DAEMON)
-	- $(sbindir)/$(DAEMON) --daemon
 	- rm -rf $(udevdb)
+	- $(sbindir)/$(DAEMON) --daemon
 endif
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -397,6 +406,7 @@ uninstall: uninstall-man
 	- rm $(sbindir)/$(INITSENDER)
 	- rm $(sbindir)/$(RECORDER)
 	- rm $(sbindir)/$(CONTROL)
+	- rm $(sbindir)/$(MONITOR)
 	- rm $(sbindir)/$(STARTER)
 	- rm $(usrbindir)/$(INFO)
 	- rm $(usrbindir)/$(TESTER)