X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=a921a22bb9b90bfec5ad1a8010308a1896252f44;hp=5833d4cb94c0844489c5d0c9fd4cd290fc691b33;hb=68e07a2b0798bd22554c82496455100f29cf6140;hpb=8c5d34e50856b9bed938cbd4f5648b62df64a04c diff --git a/Makefile b/Makefile index 5833d4cb9..a921a22bb 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,10 @@ USE_DBUS = false ROOT = udev -VERSION = 009_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 @@ -60,7 +61,7 @@ udevdir = ${prefix}/udev #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 +# to something more interesting, like "arm-linux-". If you want # to compile vs uClibc, that can be done here as well. CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- CC = $(CROSS)gcc @@ -114,8 +115,9 @@ 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. +# 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 @@ -131,7 +133,7 @@ ifeq ($(strip $(USE_KLIBC)),true) LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/include \ -I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -I$(LINUX_INCLUDE_DIR) \ - -D__KLIBC__ + -D__KLIBC__ -fno-builtin-printf LIB_OBJS = LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs else @@ -139,7 +141,7 @@ else LIBC = CFLAGS += -I$(GCCINCDIR) LIB_OBJS = -lc - LDFLAGS = --static + LDFLAGS = endif CFLAGS += -I$(PWD)/libsysfs @@ -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) udev.h namedev.h +$(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) @@ -229,7 +231,7 @@ clean: -C $$target $@ ; \ done ; \ -DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v "\.tdb" | grep -v "test\/sys" | sort ) +DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort ) DISTDIR := $(RELEASE_NAME) srcdir = . release: clean @@ -264,7 +266,8 @@ small_release: $(DISTFILES) clean 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 @@ -277,25 +280,28 @@ endif install-config: $(GEN_CONFIGS) $(INSTALL) -d $(DESTDIR)$(configdir) @if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \ - echo $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \ - $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \ + 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) udev.rules $(DESTDIR)$(configdir); \ - $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir); \ + 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) udev.permissions $(DESTDIR)$(configdir); \ - $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir); \ + 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 + @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; \ + 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 @@ -321,5 +327,3 @@ uninstall: uninstall-dbus-policy $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \ -C $$target $@ ; \ done ; \ - -