X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=2e5dd5d9cbde20318805330bddb163ea7eea4568;hp=47516b3e371408048f22882946360937976e7c90;hb=9530f1fe19529e1acb31adf5a834fa6cb0a27e6a;hpb=fbda4a34d846946bf8ed63deadfd6e65b2299792 diff --git a/Makefile b/Makefile index 47516b3e3..2e5dd5d9c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ # Makefile for udev # # Copyright (C) 2003,2004 Greg Kroah-Hartman +# Copyright (C) 2004-2005 Kay Sievers # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,32 +17,41 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Set the following to control the use of syslog -# Set it to `false' to remove all logging +# Set this to make use of syslog. USE_LOG = true -# Set the following to `true' to log the debug -# and make a unstripped, unoptimized binary. -# Leave this set to `false' for production use. +# Set this to compile-in development debug messages. Pass UDEV_LOG="debug" +# to the executed binary or set the value in the udev configuration file to +# let udev print the debug messages to syslog. DEBUG = false -# Set this to compile with Security-Enhanced Linux support. +# Set this to include Security-Enhanced Linux support. USE_SELINUX = false +# Set this to comile with klibc instead of glibc. +USE_KLIBC = false + +# Set this to create statically linked binaries. +USE_STATIC = false + +# To build any of the extras programs, run with: +# make EXTRAS="extras/a extras/b" +EXTRAS= + +# make the build silent. Set this to something else to make it noisy again. +V=false + ROOT = udev DAEMON = udevd SENDER = udevsend INFO = udevinfo TESTER = udevtest STARTER = udevstart -VERSION = 051 +VERSION = 057 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 @@ -62,22 +72,10 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -# To build any of the extras programs, run with: -# make EXTRAS="extras/a extras/b" -EXTRAS= - # place to put our device nodes udevdir = ${prefix}/udev udevdb = ${udevdir}/.udevdb -# Comment out this line to build with something other -# than the local version of klibc -#USE_KLIBC = true - -# make the build silent (well, at least the udev part) Set this -# to something else to make it noisy again. -V=false - # set up PWD so that older versions of make will work with our build. PWD = $(shell pwd) @@ -92,7 +90,7 @@ STRIP = $(CROSS)strip RANLIB = $(CROSS)ranlib HOSTCC = gcc -export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0 +export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS # code taken from uClibc to determine the current arch ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \ @@ -108,106 +106,28 @@ GCC_LIB := $(shell $(CC) -print-libgcc-file-name ) OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ then echo "-Os"; else echo "-O2" ; fi} -# add -Wredundant-decls when libsysfs gets cleaned up -WARNINGS := -Wall - -CFLAGS := -pipe - -ifeq ($(strip $(USE_LOG)),true) - CFLAGS += -DLOG -endif - -# if DEBUG is enabled, then we do not strip or optimize -ifeq ($(strip $(DEBUG)),true) - CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging -else - CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment -endif - -# 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_FIXUPS_DIR= $(PWD)/klibc_fixups - KLIBC_BASE = $(PWD)/klibc - KLIBC_DIR = $(KLIBC_BASE)/klibc - INCLUDE_DIR := $(KLIBC_BASE)/include - LINUX_INCLUDE_DIR := $(KERNEL_DIR)/include - include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG - # arch specific objects - ARCH_LIB_OBJS = $(KLIBC_DIR)/libc.a - - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) - CFLAGS += $(WARNINGS) -nostdinc \ - $(OPTFLAGS) \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ - -I$(INCLUDE_DIR) \ - -I$(INCLUDE_DIR)/arch/$(ARCH) \ - -I$(INCLUDE_DIR)/bits$(BITSIZE) \ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = - LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -else - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = - CFLAGS += $(WARNINGS) -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = -endif - -ifeq ($(strip $(USE_SELINUX)),true) - CFLAGS += -DUSE_SELINUX - LIB_OBJS += -lselinux -endif - -CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - -# config files automatically generated -GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf - -all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS) - @extras="$(EXTRAS)" ; for target in $$extras ; do \ - echo $$target ; \ - $(MAKE) prefix=$(prefix) \ - LD="$(LD)" \ - SYSFS="$(SYSFS)" \ - KERNEL_DIR="$(KERNEL_DIR)" \ - QUIET="$(QUIET)" \ - -C $$target $@ ; \ - done ; \ - -$(ARCH_LIB_OBJS) : $(CRT0) +# 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)"; fi;} -$(CRT0): - @if [ ! -r klibc/linux ]; then \ - ln -f -s $(KERNEL_DIR) klibc/linux; \ - fi - $(MAKE) -C klibc SUBDIRS=klibc TESTS= +CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare +CFLAGS += $(call cc-supports,-Wno-pointer-sign) +CFLAGS += $(call cc-supports,-Wdeclaration-after-statement) +CFLAGS += -pipe +CFLAGS += -D_GNU_SOURCE HEADERS = \ - udev.h \ - udev_utils.h \ - namedev.h \ - udev_version.h \ - udev_db.h \ - udev_sysfs.h \ - logging.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_bus.o \ libsysfs/sysfs_class.o \ libsysfs/sysfs_device.o \ libsysfs/sysfs_dir.o \ @@ -220,34 +140,58 @@ UDEV_OBJS = \ udev_config.o \ udev_add.o \ udev_remove.o \ - udev_start.o \ udev_sysfs.o \ udev_db.o \ udev_multiplex.o \ - namedev.o \ - namedev_parse.o + udev_rules.o \ + udev_rules_parse.o \ + udev_libc_wrapper.o OBJS = \ - udev.a \ + udev.a \ libsysfs/sysfs.a SYSFS = $(PWD)/libsysfs/sysfs.a -ifeq ($(strip $(USE_KLIBC)),true) - HEADERS += \ - klibc_fixups/klibc_fixups.h \ - klibc_fixups/mntent.h \ - klibc_fixups/pwd.h +CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs - KLIBC_FIXUP_OBJS = \ - klibc_fixups/klibc_fixups.o +ifeq ($(strip $(USE_LOG)),true) + CFLAGS += -DUSE_LOG +endif - OBJS += klibc_fixups/klibc_fixups.a +# if DEBUG is enabled, then we do not strip or optimize +ifeq ($(strip $(DEBUG)),true) + CFLAGS += -O1 -g -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging +else + CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer + LDFLAGS += -s -Wl + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment +endif + +# 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_INSTALL = $(PWD)/klibc/.install + KLCC = $(KLIBC_INSTALL)/bin/klcc + CC = $(KLCC) + LD = $(KLCC) + LDFLAGS += -static +else + CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations endif ifeq ($(strip $(USE_SELINUX)),true) UDEV_OBJS += udev_selinux.o LIB_OBJS += -lselinux + CFLAGS += -DUSE_SELINUX +endif + +ifeq ($(strip $(USE_STATIC)),true) + CFLAGS += -DUSE_STATIC + LDFLAGS += -static endif ifeq ($(strip $(V)),false) @@ -258,6 +202,28 @@ else HOST_PROGS= endif +# config files automatically generated +GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf + +all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC) + @extras="$(EXTRAS)" ; for target in $$extras ; do \ + echo $$target ; \ + $(MAKE) prefix=$(prefix) \ + LD="$(LD)" \ + SYSFS="$(SYSFS)" \ + KERNEL_DIR="$(KERNEL_DIR)" \ + QUIET="$(QUIET)" \ + -C $$target $@ ; \ + done ; \ + +$(KLCC): + $(MAKE) -j1 -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \ + SHLIBDIR=$(KLIBC_INSTALL)/lib \ + INSTALLDIR=$(KLIBC_INSTALL) \ + bindir=$(KLIBC_INSTALL)/bin \ + mandir=$(KLIBC_INSTALL)/man all install + -find $(KLIBC_INSTALL)/include -name SCCS -print| xargs rm -rf + udev.a: $(UDEV_OBJS) rm -f $@ $(QUIET) $(AR) cq $@ $(UDEV_OBJS) @@ -268,11 +234,6 @@ libsysfs/sysfs.a: $(SYSFS_OBJS) $(QUIET) $(AR) cq $@ $(SYSFS_OBJS) $(QUIET) $(RANLIB) $@ -klibc_fixups/klibc_fixups.a: $(KLIBC_FIXUP_OBJS) - rm -f $@ - $(QUIET) $(AR) cq $@ $(KLIBC_FIXUP_OBJS) - $(QUIET) $(RANLIB) $@ - # header files automatically generated GEN_HEADERS = udev_version.h @@ -289,7 +250,6 @@ udev_version.h: @echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@ @echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@ @echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@ - @echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@ @echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@ @echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@ @@ -303,45 +263,48 @@ GEN_MANPAGESIN = udev.8.in $(GEN_MANPAGES): $(GEN_MANPAGESIN) sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@ -$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS) -$(SYSFS_OBJS): $(HOST_PROGS) -$(KLIBC_FIXUP_OBJS): $(HOST_PROGS) -$(OBJS): $(GEN_HEADERS) $(HOST_PROGS) -$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS) -$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS) -$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS) -$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS) -$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS) -$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS) - -$(ROOT): $(LIBC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES) - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(ROOT).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) +$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(SYSFS_OBJS): $(HOST_PROGS) $(KLCC) +$(OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) +$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC) + +$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES) + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS) $(QUIET) $(STRIPCMD) $@ -$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS) - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(TESTER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) +$(TESTER): $(KLCC) $(TESTER).o $(OBJS) $(HEADERS) + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(TESTER).o $(OBJS) $(LIB_OBJS) $(QUIET) $(STRIPCMD) $@ -$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS) - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(INFO).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) +$(INFO): $(KLCC) $(INFO).o $(OBJS) $(HEADERS) + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(INFO).o $(OBJS) $(LIB_OBJS) $(QUIET) $(STRIPCMD) $@ -$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(DAEMON).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) +$(DAEMON): $(KLCC) $(DAEMON).o $(OBJS) udevd.h + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(DAEMON).o $(OBJS) $(LIB_OBJS) $(QUIET) $(STRIPCMD) $@ -$(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(SENDER).o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) +$(SENDER): $(KLCC) $(SENDER).o $(OBJS) udevd.h + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(SENDER).o $(OBJS) $(LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ + +$(STARTER): $(KLCC) $(STARTER).o $(OBJS) + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS) $(QUIET) $(STRIPCMD) $@ .c.o: $(QUIET) $(CC) $(CFLAGS) -c -o $@ $< - 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) $(TESTER) + -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \ + $(SENDER) $(TESTER) $(STARTER) -rm -f ccdv $(MAKE) -C klibc SUBDIRS=klibc clean @extras="$(EXTRAS)" ; for target in $$extras ; do \ @@ -352,7 +315,7 @@ clean: spotless: clean $(MAKE) -C klibc SUBDIRS=klibc spotless - -rm -f klibc/linux + rm -rf klibc/.install DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz" -e "\/\." -e releases -e BitKeeper -e SCCS -e test/sys | sort ) DISTDIR := $(RELEASE_NAME) @@ -361,7 +324,7 @@ release: spotless -rm -rf $(DISTDIR) mkdir $(DISTDIR) chmod 777 $(DISTDIR) - bk export $(DISTDIR) + bk export -w $(DISTDIR) tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz rm -rf $(DISTDIR) @echo "$(RELEASE_NAME).tar.gz created" @@ -428,7 +391,7 @@ install: install-config install-man install-dev.d all $(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER) $(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO) $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER) - - ln -f -s $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER) + $(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER) - ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug ifndef DESTDIR - killall $(DAEMON) @@ -464,3 +427,4 @@ uninstall: uninstall-man uninstall-dev.d test: all @ cd test && ./udev-test.pl + @ cd test && ./udevstart-test.pl