X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=1b3815f3bb7069f663624d99b28ae3d9346a1908;hp=db8ecdacc62510ba065980e3ba697989a017ad08;hb=708cb3594139f28f7d99b4ea1cf91b4ccd032273;hpb=4942c78cb01ef4100a3cbce577fc3262b82d9be4 diff --git a/Makefile b/Makefile index db8ecdacc..1b3815f3b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile for udev # # Copyright (C) 2003,2004 Greg Kroah-Hartman -# Copyright (C) 2004-2005 Kay Sievers +# Copyright (C) 2004-2006 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 @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 083 +VERSION = 097 # set this to make use of syslog USE_LOG = true @@ -33,9 +33,6 @@ USE_GCOV = false # include Security-Enhanced Linux support USE_SELINUX = false -# comile with klibc instead of glibc -USE_KLIBC = false - # set this to create statically linked binaries USE_STATIC = false @@ -43,13 +40,14 @@ USE_STATIC = false # make EXTRAS="extras/ extras/" EXTRAS = -# make the build silent. -V = false +# make the build silent +V = PROGRAMS = \ udev \ udevd \ - udevsend \ + udevtrigger \ + udevsettle \ udevcontrol \ udevmonitor \ udevinfo \ @@ -58,17 +56,17 @@ PROGRAMS = \ HEADERS = \ udev.h \ + udevd.h \ udev_rules.h \ logging.h \ - udev_libc_wrapper.h \ + udev_sysdeps.h \ udev_selinux.h \ list.h UDEV_OBJS = \ udev_device.o \ udev_config.o \ - udev_add.o \ - udev_remove.o \ + udev_node.o \ udev_db.o \ udev_sysfs.o \ udev_rules.o \ @@ -77,14 +75,15 @@ UDEV_OBJS = \ udev_utils_string.o \ udev_utils_file.o \ udev_utils_run.o \ - udev_libc_wrapper.o + udev_sysdeps.o LIBUDEV = libudev.a MAN_PAGES = \ udev.7 \ udevmonitor.8 \ udevd.8 \ - udevsend.8 \ + udevtrigger.8 \ + udevsettle.8 \ udevtest.8 \ udevinfo.8 \ udevstart.8 @@ -114,9 +113,6 @@ CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)gcc AR = $(CROSS_COMPILE)ar RANLIB = $(CROSS_COMPILE)ranlib -HOSTCC = gcc -STRIP = $(CROSS_COMPILE)strip -STRIPCMD = $(STRIP) -s CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ @@ -136,7 +132,6 @@ endif # if DEBUG is enabled, then we do not strip ifeq ($(strip $(DEBUG)),true) CFLAGS += -DDEBUG - STRIPCMD = endif ifeq ($(strip $(USE_GCOV)),true) @@ -144,13 +139,6 @@ ifeq ($(strip $(USE_GCOV)),true) LDFLAGS += -fprofile-arcs endif -ifeq ($(strip $(USE_KLIBC)),true) - KLCC = /usr/bin/$(CROSS_COMPILE)klcc - CC = $(KLCC) - LD = $(KLCC) - V = true -endif - ifeq ($(strip $(USE_SELINUX)),true) UDEV_OBJS += udev_selinux.o LIB_OBJS += -lselinux -lsepol @@ -162,25 +150,25 @@ ifeq ($(strip $(USE_STATIC)),true) LDFLAGS += -static endif -ifeq ($(strip $(V)),false) - QUIET=@$(PWD)/ccdv - HOST_PROGS=ccdv +ifeq ($(strip $(V)),) + E = @echo + Q = @ else - QUIET= - HOST_PROGS= + E = @\# + Q = endif +export E Q all: $(PROGRAMS) $(MAN_PAGES) - @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ + $(Q) extras="$(EXTRAS)"; for target in $$extras; do \ $(MAKE) CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ LD="$(LD)" \ LDFLAGS="$(LDFLAGS)" \ - STRIPCMD="$(STRIPCMD)" \ + AR="$(AR)" \ + RANLIB="$(RANLIB)" \ LIB_OBJS="$(LIB_OBJS)" \ LIBUDEV="$(PWD)/$(LIBUDEV)" \ - QUIET="$(QUIET)" \ -C $$target $@ || exit 1; \ done; .PHONY: all @@ -190,49 +178,50 @@ all: $(PROGRAMS) $(MAN_PAGES) .SUFFIXES: # build the objects -%.o: %.c $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) - $(QUIET) $(CC) -c $(CFLAGS) $< -o $@ +%.o: %.c $(HEADERS) $(GEN_HEADERS) + $(E) " CC " $@ + $(Q) $(CC) -c $(CFLAGS) $< -o $@ # "Static Pattern Rule" to build all programs -$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o - $(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS) -ifneq ($(STRIPCMD),) - $(QUIET) $(STRIPCMD) $@ -endif +$(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o + $(E) " LD " $@ + $(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS) -$(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS) - @rm -f $@ - $(QUIET) $(AR) cq $@ $(UDEV_OBJS) - $(QUIET) $(RANLIB) $@ +$(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS) + $(Q) rm -f $@ + $(E) " AR " $@ + $(Q) $(AR) cq $@ $(UDEV_OBJS) + $(E) " RANLIB " $@ + $(Q) $(RANLIB) $@ udev_version.h: - @echo "/* Generated by make. */" > $@ - @echo \#define UDEV_VERSION \"$(VERSION)\" >> $@ - @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@ - @echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@ - @echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@ + $(E) " GENHDR " $@ + $(Q) echo "/* Generated by make. */" > $@ + $(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@ + $(Q) echo \#define UDEV_ROOT \"$(udevdir)\" >> $@ + $(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@ + $(Q) echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@ # man pages -%.8 %.7: docs/%.xml - xmlto man $? +%.8 %.7: %.xml + $(E) " XMLTO " $@ + $(Q) xmlto man $? .PRECIOUS: %.8 -ccdv: ccdv.c - @$(HOSTCC) -O1 ccdv.c -o ccdv -.SILENT: ccdv - clean: - - rm -f $(HOST_PROGS) - - find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print0 | xargs -0rt rm -f - - find -name "*.gcno" -print0 | xargs -0rt rm -f - - find -name "*.gcda" -print0 | xargs -0rt rm -f - - find -name "*.gcov" -print0 | xargs -0rt rm -f - - rm -f udev_gcov.txt - - rm -f core $(PROGRAMS) $(GEN_HEADERS) - - rm -f udev-$(VERSION).tar.gz - - rm -f udev-$(VERSION).tar.bz2 - @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ + $(E) " CLEAN " + $(Q) - find . -type f -name '*.orig' -print0 | xargs -0r rm -f + $(Q) - find . -type f -name '*.rej' -print0 | xargs -0r rm -f + $(Q) - find . -type f -name '*~' -print0 | xargs -0r rm -f + $(Q) - find . -type f -name '*.[oas]' -print0 | xargs -0r rm -f + $(Q) - find . -type f -name "*.gcno" -print0 | xargs -0r rm -f + $(Q) - find . -type f -name "*.gcda" -print0 | xargs -0r rm -f + $(Q) - find . -type f -name "*.gcov" -print0 | xargs -0r rm -f + $(Q) - rm -f udev_gcov.txt + $(Q) - rm -f core $(PROGRAMS) $(GEN_HEADERS) + $(Q) - rm -f udev-$(VERSION).tar.gz + $(Q) - rm -f udev-$(VERSION).tar.bz2 + @ extras="$(EXTRAS)"; for target in $$extras; do \ $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: clean @@ -244,16 +233,15 @@ release: install-config: $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d - @if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \ + @ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \ $(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \ fi - @if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \ + @ if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \ echo; \ echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \ echo; \ fi - @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ + @ extras="$(EXTRAS)"; for target in $$extras; do \ $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: install-config @@ -263,10 +251,11 @@ install-man: $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8 $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8 $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8 + $(INSTALL_DATA) -D udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8 + $(INSTALL_DATA) -D udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8 $(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8 - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8 @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: install-man @@ -276,10 +265,11 @@ uninstall-man: - rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8 - rm -f $(DESTDIR)$(mandir)/man8/udevtest.8 - rm -f $(DESTDIR)$(mandir)/man8/udevd.8 + - rm -f $(DESTDIR)$(mandir)/man8/udevtrigger.8 + - rm -f $(DESTDIR)$(mandir)/man8/udevsettle.8 - rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8 - rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8 - @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ + @ extras="$(EXTRAS)"; for target in $$extras; do \ $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: uninstall-man @@ -287,12 +277,13 @@ uninstall-man: install-bin: $(INSTALL) -d $(DESTDIR)$(udevdir) $(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd + $(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger + $(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle $(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol $(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor $(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo $(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ $(MAKE) -C $$target $@ || exit 1; \ done; ifndef DESTDIR @@ -304,6 +295,8 @@ endif uninstall-bin: - rm -f $(DESTDIR)$(sbindir)/udevd + - rm -f $(DESTDIR)$(sbindir)/udevtrigger + - rm -f $(DESTDIR)$(sbindir)/udevsettle - rm -f $(DESTDIR)$(sbindir)/udevcontrol - rm -f $(DESTDIR)$(usrsbindir)/udevmonitor - rm -f $(DESTDIR)$(usrbindir)/udevinfo @@ -313,7 +306,6 @@ ifndef DESTDIR - rm -rf /dev/.udev endif @extras="$(EXTRAS)"; for target in $$extras; do \ - echo $$target; \ $(MAKE) -C $$target $@ || exit 1; \ done; .PHONY: uninstall-bin @@ -345,10 +337,10 @@ ChangeLog: Makefile @ rm $@.tmp gcov-all: - $(MAKE) clean all STRIPCMD= USE_GCOV=true - @echo - @echo "binaries built with gcov support." - @echo "run the tests and analyze with 'make udev_gcov.txt'" + $(MAKE) clean all USE_GCOV=true + @ echo + @ echo "binaries built with gcov support." + @ echo "run the tests and analyze with 'make udev_gcov.txt'" .PHONY: gcov-all # see docs/README-gcov_for_udev