X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=af7d9555ad852a1b24cf1e0a068ce47b0088e599;hp=1b9534c7b8100b18ff14fe95f6d9a1ca9a753093;hb=956cf79390e303925135663a858456dd0a26e6c6;hpb=15ff0ba36e9c1f051fe1e35e69f8569d0dfe2d66 diff --git a/Makefile b/Makefile index 1b9534c7b..af7d9555a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ -# Makefile for udev # -# Copyright (C) 2003,2004 Greg Kroah-Hartman +# Copyright (C) 2003-2004 Greg Kroah-Hartman # Copyright (C) 2004-2006 Kay Sievers # # This program is free software; you can redistribute it and/or modify @@ -14,10 +13,10 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION = 088 +VERSION = 112 # set this to make use of syslog USE_LOG = true @@ -33,9 +32,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 @@ -47,29 +43,29 @@ EXTRAS = V = PROGRAMS = \ - udev \ udevd \ udevtrigger \ - udevsend \ + udevsettle \ udevcontrol \ udevmonitor \ udevinfo \ udevtest \ + test-udev \ udevstart 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 \ @@ -78,7 +74,7 @@ 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 = \ @@ -86,7 +82,7 @@ MAN_PAGES = \ udevmonitor.8 \ udevd.8 \ udevtrigger.8 \ - udevsend.8 \ + udevsettle.8 \ udevtest.8 \ udevinfo.8 \ udevstart.8 @@ -94,7 +90,7 @@ MAN_PAGES = \ GEN_HEADERS = \ udev_version.h -prefix = +prefix ?= etcdir = ${prefix}/etc sbindir = ${prefix}/sbin usrbindir = ${prefix}/usr/bin @@ -105,26 +101,25 @@ configdir = ${etcdir}/udev udevdir = /dev DESTDIR = -INSTALL = /usr/bin/install -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_SCRIPT = ${INSTALL} PWD = $(shell pwd) -CROSS_COMPILE = +CROSS_COMPILE ?= CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)gcc AR = $(CROSS_COMPILE)ar RANLIB = $(CROSS_COMPILE)ranlib -HOSTCC = gcc -CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +CFLAGS += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes CFLAGS += $(WARNINGS) -LDFLAGS = -Wl,-warn-common +LDFLAGS += -Wl,-warn-common OPTFLAGS = -Os CFLAGS += $(OPTFLAGS) @@ -143,12 +138,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) -endif - ifeq ($(strip $(USE_SELINUX)),true) UDEV_OBJS += udev_selinux.o LIB_OBJS += -lselinux -lsepol @@ -175,6 +164,8 @@ all: $(PROGRAMS) $(MAN_PAGES) CFLAGS="$(CFLAGS)" \ LD="$(LD)" \ LDFLAGS="$(LDFLAGS)" \ + AR="$(AR)" \ + RANLIB="$(RANLIB)" \ LIB_OBJS="$(LIB_OBJS)" \ LIBUDEV="$(PWD)/$(LIBUDEV)" \ -C $$target $@ || exit 1; \ @@ -208,7 +199,7 @@ udev_version.h: $(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\" >> $@ + $(Q) echo \#define UDEV_RULES_DIR \"$(configdir)/rules.d\" >> $@ # man pages %.8 %.7: %.xml @@ -235,8 +226,8 @@ clean: .PHONY: clean release: - git-tar-tree HEAD udev-$(VERSION) | gzip -9v > udev-$(VERSION).tar.gz - git-tar-tree HEAD udev-$(VERSION) | bzip2 -9v > udev-$(VERSION).tar.bz2 + git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz + git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2 .PHONY: release install-config: @@ -260,6 +251,7 @@ install-man: $(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 \ @@ -273,6 +265,7 @@ uninstall-man: - 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 \ @@ -284,6 +277,7 @@ 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 @@ -301,6 +295,7 @@ 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 @@ -331,10 +326,10 @@ buildtest: ChangeLog: Makefile @ mv $@ $@.tmp - @ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@ + @ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@ @ echo "============================================" >> $@ @ echo >> $@ - @ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog >> $@ + @ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog >> $@ @ echo >> $@ @ cat $@ @ cat $@.tmp >> $@