X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=ffd61c0400e1793ddb73e6e67707ca939368ecfc;hp=bd9a9035eebb4a6ab6e6e9859d3d2ebcfea28e19;hb=f1db055ab2e349ce22254562faaece66d6a4a873;hpb=dbc9b3f3a20520db6fcf791a3663ab943fc193d9

diff --git a/Makefile b/Makefile
index bd9a9035e..ffd61c040 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,14 @@ DEBUG = false
 
 # Set the following to `true' to make udev emit a D-BUS signal when a
 # new node is created.
-DBUS = false
+USE_DBUS = false
 
 
 ROOT =		udev
-VERSION =	008_bk
+VERSION =	012_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
+LOCAL_CFG_DIR =	etc/udev
 
 DESTDIR =
 # override this to make udev look in a different location for it's config files
@@ -57,7 +58,7 @@ udevdir = ${prefix}/udev
 
 # Comment out this line to build with something other 
 # than the local version of klibc
-#KLIBC = true
+#USE_KLIBC = true
 
 # If you are running a cross compiler, you may want to set this
 # to something more interesting, like "arm-linux-".  I you want
@@ -114,9 +115,10 @@ else
 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
 
-# If we are using our version of klibc, then we need to build and link it.
-# Otherwise, use glibc and link statically.
-ifeq ($(strip $(KLIBC)),true)
+# If we are using our version of klibc, then we need to build, link it, and then
+# link udev against it statically.
+# Otherwise, use glibc and link dynamically.
+ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_BASE	= $(PWD)/klibc
 	KLIBC_DIR	= $(KLIBC_BASE)/klibc
 	INCLUDE_DIR	:= $(KLIBC_DIR)/include
@@ -139,13 +141,13 @@ else
 	LIBC = 
 	CFLAGS += -I$(GCCINCDIR)
 	LIB_OBJS = -lc
-	LDFLAGS = --static 
+	LDFLAGS =
 endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
 all: $(ROOT)
-	@for target in $(EXTRAS) ; do \
+	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \
@@ -180,11 +182,11 @@ OBJS =	udev.o		\
 	$(SYSFS)	\
 	$(TDB)
 
-ifeq ($(strip $(KLIBC)),true)
+ifeq ($(strip $(USE_KLIBC)),true)
 	OBJS += klibc_fixups.o
 endif
 
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
 	CFLAGS += -DUSE_DBUS
 	CFLAGS += $(shell pkg-config --cflags dbus-1)
 	LDFLAGS += $(shell pkg-config --libs dbus-1)
@@ -205,16 +207,16 @@ udev_version.h:
 	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
 
 # config files automatically generated
-GEN_CONFIGS =	udev.conf
+GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
 
 # Rules on how to create the generated config files
-udev.conf:
-	sed -e "s-@udevdir@-$(udevdir)-" < udev.conf.in > $@
+$(LOCAL_CFG_DIR)/udev.conf:
+	sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 
 $(OBJS): $(GEN_HEADERS)
 
-$(ROOT): $(OBJS)
+$(ROOT): $(OBJS) udev.h namedev.h udev_version.h udev_dbus.h udevdb.h klibc_fixups.h list.h
 	$(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $(ROOT)
 
@@ -223,7 +225,7 @@ clean:
 	 | xargs rm -f 
 	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS)
 	$(MAKE) -C klibc clean
-	@for target in $(EXTRAS) ; do \
+	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \
@@ -261,10 +263,11 @@ small_release: $(DISTFILES) clean
 	@echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(DBUS), true)
+ifeq ($(USE_DBUS), true)
 install-dbus-policy:
 	$(INSTALL) -d $(DESTDIR)$(dbusdir)
-	$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+	$(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+
 uninstall-dbus-policy:
 	- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
 else
@@ -274,19 +277,32 @@ uninstall-dbus-policy:
 	-
 endif
 
-install: install-dbus-policy all $(GEN_CONFIGS)
-	$(INSTALL) -d $(DESTDIR)$(udevdir)
+install-config: $(GEN_CONFIGS)
 	$(INSTALL) -d $(DESTDIR)$(configdir)
+	@if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
+	fi
+	@if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
+	fi
+	@if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
+	fi
+
+
+
+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 etc/init.d/udev $(DESTDIR)$(initdir)/udev
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
-	$(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir)
-	$(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir)
-	$(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir)
 	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
-	- ln -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
-	@for target in $(EXTRAS) ; do \
+	- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
+	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \
@@ -297,12 +313,13 @@ uninstall: uninstall-dbus-policy
 	- rm $(configdir)/udev.permissions
 	- rm $(configdir)/udev.rules
 	- rm $(configdir)/udev.conf
+	- rm $(initdir)/udev
 	- rm $(mandir)/man8/udev.8
 	- rm $(sbindir)/$(ROOT)
 	- rmdir $(hotplugdir)
 	- rmdir $(configdir)
 	- rmdir $(udevdir)
-	@for target in $(EXTRAS) ; do \
+	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \