X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=676302819d6e55a14d58f2ebf315a4b1e719527c;hp=90b69420a88d2e9b0e19093d72ad1a3c951c0654;hb=482b0ecd8fcc2651c003c6f1ae9a2d3301ecf34a;hpb=d1f382f026ce03b9f2ef9111bacd821cbb33f743 diff --git a/Makefile b/Makefile index 90b69420a..676302819 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,8 @@ SENDER = udevsend INFO = udevinfo TESTER = udevtest STARTER = udevstart -RULER = udevruler WAIT = wait_for_sysfs -VERSION = 034 +VERSION = 045 INSTALL_DIR = /usr/local/bin RELEASE_NAME = $(ROOT)-$(VERSION) LOCAL_CFG_DIR = etc/udev @@ -75,6 +74,10 @@ udevdir = ${prefix}/udev # 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) @@ -87,6 +90,7 @@ LD = $(CROSS)gcc AR = $(CROSS)ar STRIP = $(CROSS)strip RANLIB = $(CROSS)ranlib +HOSTCC = gcc export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0 @@ -107,7 +111,7 @@ OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2> # add -Wredundant-decls when libsysfs gets cleaned up WARNINGS := -Wall -CFLAGS := -pipe -Dasmlinkage= +CFLAGS := -pipe # set up the proper tdb spinlock code if we can ifeq ($(strip $(ARCH)),i386) @@ -133,6 +137,7 @@ endif # 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 @@ -145,13 +150,15 @@ ifeq ($(strip $(USE_KLIBC)),true) CRT0 = $(KLIBC_DIR)/crt0.o LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) - CFLAGS += $(WARNINGS) -nostdinc \ - $(OPTFLAGS) \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(INCLUDE_DIR) \ - -I$(INCLUDE_DIR)/arch/$(ARCH) \ - -I$(INCLUDE_DIR)/bits$(BITSIZE) \ - -I$(GCCINCDIR) \ + 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 @@ -169,7 +176,8 @@ ifeq ($(strip $(USE_SELINUX)),true) LIB_OBJS += -lselinux endif -CFLAGS += -I$(PWD)/libsysfs +CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs # config files automatically generated GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf @@ -181,6 +189,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS) LD="$(LD)" \ SYSFS="$(SYSFS)" \ KERNEL_DIR="$(KERNEL_DIR)" \ + QUIET="@$(PWD)/ccdv" \ -C $$target $@ ; \ done ; \ @@ -205,8 +214,9 @@ SYSFS = $(PWD)/libsysfs/sysfs_bus.o \ OBJS = udev_lib.o \ udev_config.o \ - udev-add.o \ - udev-remove.o \ + udev_add.o \ + udev_remove.o \ + udev_sysfs.o \ udevdb.o \ namedev.o \ namedev_parse.o \ @@ -219,21 +229,38 @@ HEADERS = udev.h \ namedev.h \ udev_version.h \ udevdb.h \ - klibc_fixups.h \ + udev_sysfs.h \ logging.h \ selinux.h \ list.h ifeq ($(strip $(USE_KLIBC)),true) - OBJS += klibc_fixups.o - KLIBC_FIXUP = klibc_fixups.o + HEADERS += klibc_fixups/klibc_fixups.h \ + klibc_fixups/mntent.h \ + klibc_fixups/pwd.h + + OBJS += klibc_fixups/klibc_fixups.o + KLIBC_FIXUP = klibc_fixups/klibc_fixups.o +endif + +ifeq ($(strip $(V)),false) + QUIET=@./ccdv + HOST_PROGS=ccdv +else + QUIET= + HOST_PROGS= endif # header files automatically generated GEN_HEADERS = udev_version.h +ccdv: + @echo "Building ccdv" + @$(HOSTCC) -O1 ccdv.c -o ccdv + # Rules on how to create the generated header files udev_version.h: + @echo "Creating udev_version.h" @echo \#define UDEV_VERSION \"$(VERSION)\" > $@ @echo \#define UDEV_ROOT \"$(udevdir)/\" >> $@ @echo \#define UDEV_DB \"$(udevdir)/.udev.tdb\" >> $@ @@ -255,47 +282,50 @@ GEN_MANPAGESIN = udev.8.in $(GEN_MANPAGES): $(GEN_MANPAGESIN) sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@ - -$(OBJS): $(GEN_HEADERS) -$(ROOT).o: $(GEN_HEADERS) -$(TESTER).o: $(GEN_HEADERS) -$(INFO).o: $(GEN_HEADERS) -$(DAEMON).o: $(GEN_HEADERS) -$(SENDER).o: $(GEN_HEADERS) -$(STARTER).o: $(GEN_HEADERS) +$(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) +$(WAIT).o: $(GEN_HEADERS) $(HOST_PROGS) $(ROOT): $(LIBC) $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(GEN_MANPAGES) - $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(STRIPCMD) $@ + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ $(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS) - $(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(STRIPCMD) $@ + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ $(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS) - $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(STRIPCMD) $@ + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ $(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h - $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(STRIPCMD) $@ + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ $(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h - $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(STRIPCMD) $@ - -$(RULER): $(LIBC) $(RULER).o $(OBJS) $(HEADERS) - $(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt - $(STRIPCMD) $@ + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ $(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC) - $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(STRIPCMD) $@ + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o udev_sysfs.o udev_lib.o udev_config.o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ + +#.c.o: +# $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) -c -o $@ $< +.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) $(RULER) $(WAIT) + -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(WAIT) + -rm -f ccdv $(MAKE) -C klibc clean @extras="$(EXTRAS)" ; for target in $$extras ; do \ echo $$target ; \ @@ -337,13 +367,11 @@ small_release: $(DISTFILES) clean @echo "Built $(RELEASE_NAME).tar.gz" -install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB +install-initscript: etc/init.d/udev etc/init.d/udev.init.LSB @if [ -f /etc/redhat-release ]; then \ $(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \ elif [ -f /etc/SuSE-release ]; then \ $(INSTALL_DATA) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \ - elif [ -f /etc/debian_version ]; then \ - $(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \ fi install-config: @@ -435,3 +463,6 @@ uninstall: uninstall-man uninstall-dev.d $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \ -C $$target $@ ; \ done ; \ + +test: all + @ cd test && ./udev-test.pl