X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=b24e147838f6d4613bc942eb84affcc274d167f7;hp=30ebd45eedecc0f09d3558378d0d447eef8df198;hb=8481f8ce2bd2b19ebcf3cb96ac6825093f626b0f;hpb=eea34a0e9909405467185bb1e5291e6cc88fd0bc

diff --git a/Makefile b/Makefile
index 30ebd45ee..b24e14783 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,18 @@ USE_DBUS = false
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
-VERSION =	014_bk
+HELPER =	udevinfo
+TESTER =	udevtest
+VERSION =	018_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
+HOTPLUG_EXEC =	$(ROOT)
 
 DESTDIR =
+
+KERNEL_DIR = /lib/modules/${shell uname -r}/build
+
 # override this to make udev look in a different location for it's config files
 prefix =
 exec_prefix =	${prefix}
@@ -67,6 +73,9 @@ udevdir = ${prefix}/udev
 # than the local version of klibc
 #USE_KLIBC = true
 
+# set up PWD so that older versions of make will work with our build.
+PWD = $(shell pwd)
+
 # If you are running a cross compiler, you may want to set this
 # to something more interesting, like "arm-linux-".  If you want
 # to compile vs uClibc, that can be done here as well.
@@ -133,7 +142,8 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_BASE	= $(PWD)/klibc
 	KLIBC_DIR	= $(KLIBC_BASE)/klibc
 	INCLUDE_DIR	:= $(KLIBC_DIR)/include
-	LINUX_INCLUDE_DIR	:= $(KLIBC_BASE)/linux/include
+	LINUX_INCLUDE_DIR	:= $(KERNEL_DIR)/include
+#	LINUX_INCLUDE_DIR	:= $(KLIBC_BASE)/linux/include
 	include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
 	# arch specific objects
 	ARCH_LIB_OBJS =	\
@@ -162,19 +172,20 @@ endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(DAEMON) $(SENDER)
+all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER) $(TESTER)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+		$(MAKE) prefix=$(prefix) \
+			LD="$(LD)" \
+			SYSFS="$(SYSFS)" \
+			KERNEL_DIR="$(KERNEL_DIR)" \
 			-C $$target $@ ; \
 	done ; \
 
-$(ROOT): $(LIBC)
-
 $(ARCH_LIB_OBJS) : $(CRT0)
 
 $(CRT0):
-	$(MAKE) -C klibc
+	$(MAKE) -C klibc KERNEL_DIR=$(KERNEL_DIR)
 
 TDB =	tdb/tdb.o	\
 	tdb/spinlock.o
@@ -187,17 +198,24 @@ SYSFS =	$(PWD)/libsysfs/sysfs_bus.o	\
 	$(PWD)/libsysfs/sysfs_utils.o	\
 	$(PWD)/libsysfs/dlist.o
 
-OBJS =	udev.o		\
-	udev_config.o	\
+OBJS =	udev_config.o	\
 	udev-add.o	\
 	udev-remove.o	\
 	udevdb.o	\
-	logging.o	\
 	namedev.o	\
 	namedev_parse.o	\
 	$(SYSFS)	\
 	$(TDB)
 
+HEADERS =	udev.h		\
+		namedev.h	\
+		udev_version.h	\
+		udev_dbus.h	\
+		udevdb.h	\
+		klibc_fixups.h	\
+		logging.h	\
+		list.h
+
 ifeq ($(strip $(USE_KLIBC)),true)
 	OBJS += klibc_fixups.o
 endif
@@ -209,6 +227,14 @@ ifeq ($(USE_DBUS), true)
 	OBJS += udev_dbus.o
 endif
 
+# if USE_SELINUX is enabled, then we do not strip or optimize
+ifeq ($(strip $(USE_SELINUX)),true)
+	CFLAGS  += -DUSE_SELINUX
+	OBJS += udev_selinux.o
+	LIB_OBJS += -lselinux
+endif
+
+
 # header files automatically generated
 GEN_HEADERS =	udev_version.h
 
@@ -221,6 +247,9 @@ udev_version.h:
 	@echo \#define UDEV_CONFIG_FILE	\"$(configdir)\udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE	\"$(configdir)\udev.rules\" >> $@
 	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
+	@echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
+	@echo \#define UDEV_BIN		\"$(DESTDIR)$(sbindir)/udev\" >> $@
+	@echo \#define UDEVD_BIN	\"$(DESTDIR)$(sbindir)/udevd\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
@@ -231,23 +260,36 @@ $(LOCAL_CFG_DIR)/udev.conf:
 
 
 $(OBJS): $(GEN_HEADERS)
+$(ROOT).o: $(GEN_HEADERS)
+$(TESTER).o: $(GEN_HEADERS)
+$(HELPER).o: $(GEN_HEADERS)
+$(DAEMON).o: $(GEN_HEADERS)
+$(SENDER).o: $(GEN_HEADERS)
+
+$(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
+
+$(TESTER): $(TESTER).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
 
-$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h logging.h list.h
-	$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $(ROOT)
+$(HELPER): $(HELPER).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
 
-$(DAEMON): $(ROOT) udevd.h udevd.o
-	$(LD) $(LDFLAGS) -o $(DAEMON) $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $(ROOT)
+$(DAEMON): $(DAEMON).o udevd.h $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
 
-$(SENDER): $(ROOT) udevd.h udevsend.o
-	$(LD) $(LDFLAGS) -o $(SENDER) $(CRT0) udevsend.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
-	$(STRIPCMD) $(ROOT)
+$(SENDER): $(SENDER).o udevd.h $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
 
 clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(DAEMON) $(SENDER)
+	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(HELPER) $(DAEMON) $(SENDER) $(TESTER)
 	$(MAKE) -C klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -259,15 +301,13 @@ DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.ta
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: clean
-	@echo "--------------------------cut here------------------------"
-	@echo "cd .."
-	@echo "rm -rf $(DISTDIR)"
-	@echo "mkdir $(DISTDIR)"
-	@echo "chmod 777 $(DISTDIR)"
-	@echo "cp -avr udev/* $(DISTDIR)"
-	@echo "tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz"
-	@echo "rm -rf $(DISTDIR)"
-	@echo "--------------------------cut here------------------------"
+	-rm -rf $(DISTDIR)
+	mkdir $(DISTDIR)
+	chmod 777 $(DISTDIR)
+	bk export $(DISTDIR)
+	tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
+	rm -rf $(DISTDIR)
+	@echo "$(RELEASE_NAME).tar.gz created"
 
 
 small_release: $(DISTFILES) clean
@@ -320,15 +360,23 @@ install: install-config install-dbus-policy all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
+	$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
+	$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
+	$(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
+	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(sbindir)/$(TESTER)
 	@if [ "x$(USE_LSB)" = "xtrue" ]; then \
 		$(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
-		ln -s $(DESTDIR)$(initdir)/udev $(sbin_dir)/rcudev; \
+		ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
 	else \
 		$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
 	fi
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
-	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
-	- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
+	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
+	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+	- ln -f -s ./udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
+	- rm -f $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
+	- rm -f $(DESTDIR)$(udevdir)/.udev.tdb
+	- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@ -342,9 +390,14 @@ uninstall: uninstall-dbus-policy
 	- rm $(configdir)/udev.conf
 	- rm $(initdir)/udev
 	- rm $(mandir)/man8/udev.8
+	- rm $(mandir)/man8/udevinfo.8
 	- rm $(sbindir)/$(ROOT)
+	- rm $(sbindir)/$(DAEMON)
+	- rm $(sbindir)/$(SENDER)
+	- rm $(sbindir)/$(HELPER)
 	- rmdir $(hotplugdir)
 	- rmdir $(configdir)
+	- rm $(udevdir)/.udev.tdb
 	- rmdir $(udevdir)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \