X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=9f7c439974a24631dd7111e0abb8e2493048264b;hb=7eb136adb8fe265050b2a3e44b216e747163743f;hp=a4bba06d55b5e528817cb773e1da5ecdc0dc9603;hpb=d54fe24caa38ffc6e5dee7ef5cdcb3c24a882bf8;p=elogind.git

diff --git a/Makefile b/Makefile
index a4bba06d5..9f7c43997 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ DAEMON =	udevd
 SENDER =	udevsend
 HELPER =	udevinfo
 TESTER =	udevtest
-VERSION =	018_bk
+VERSION =	019
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -73,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.
@@ -224,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
 
@@ -278,7 +289,7 @@ $(SENDER): $(SENDER).o udevd.h $(LIBC)
 clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(HELPER) $(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 ; \
@@ -364,7 +375,7 @@ install: install-config install-dbus-policy all
 	$(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 $(udevdir)/.udev.tdb
+	- rm -f $(DESTDIR)$(udevdir)/.udev.tdb
 	- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \