chiark / gitweb /
only install *.rules
[elogind.git] / Makefile
index 55cecd3755d1d0e6414cd1971480565ba4a57690..92ca846bec7ee7773de5febcc388d6b8c90b3913 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-# Makefile for udev
 #
-# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+# Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
 # Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
 #
 # This program is free software; you can redistribute it and/or modify
 #
 # 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 = 084
+VERSION = 115
 
 # 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,28 +43,29 @@ EXTRAS =
 V =
 
 PROGRAMS = \
-       udev                            \
        udevd                           \
-       udevsend                        \
+       udevtrigger                     \
+       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                    \
@@ -76,15 +73,15 @@ UDEV_OBJS = \
        udev_utils.o                    \
        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
@@ -92,7 +89,7 @@ MAN_PAGES = \
 GEN_HEADERS = \
        udev_version.h
 
-prefix =
+prefix ?=
 etcdir =       ${prefix}/etc
 sbindir =      ${prefix}/sbin
 usrbindir =    ${prefix}/usr/bin
@@ -103,28 +100,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
-STRIP = $(CROSS_COMPILE)strip
-STRIPCMD = $(STRIP) -s
 
-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,--as-needed
 
 OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
@@ -136,7 +130,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,12 +137,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
@@ -176,7 +163,8 @@ all: $(PROGRAMS) $(MAN_PAGES)
                        CFLAGS="$(CFLAGS)" \
                        LD="$(LD)" \
                        LDFLAGS="$(LDFLAGS)" \
-                       STRIPCMD="$(STRIPCMD)" \
+                       AR="$(AR)" \
+                       RANLIB="$(RANLIB)" \
                        LIB_OBJS="$(LIB_OBJS)" \
                        LIBUDEV="$(PWD)/$(LIBUDEV)" \
                        -C $$target $@ || exit 1; \
@@ -196,10 +184,6 @@ all: $(PROGRAMS) $(MAN_PAGES)
 $(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
        $(E) "  LD      " $@
        $(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(STRIPCMD),)
-       $(E) "  STRIP   " $@
-       $(Q) $(STRIPCMD) $@
-endif
 
 $(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
        $(Q) rm -f $@
@@ -214,7 +198,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,26 +219,22 @@ clean:
        $(Q) - rm -f core $(PROGRAMS) $(GEN_HEADERS)
        $(Q) - rm -f udev-$(VERSION).tar.gz
        $(Q) - rm -f udev-$(VERSION).tar.bz2
+       $(Q) - rm -f udev-git-HEAD.patch
        @ extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
 .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
-.PHONY: release
-
 install-config:
        $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
        @ 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 \
-               echo; \
-               echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
-               echo; \
-       fi
+       @ for i in etc/udev/rules.d/*.rules; do \
+               if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
+                       $(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
+               fi \
+       done
        @ extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
@@ -265,6 +245,8 @@ 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 \
@@ -277,6 +259,8 @@ 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 \
@@ -287,6 +271,8 @@ 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
@@ -303,6 +289,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
@@ -331,19 +319,44 @@ buildtest:
        test/simple-build-check.sh
 .PHONY: buildtest
 
-ChangeLog: Makefile
+ChangeLog:
+       head -1 $@ | grep -q "to v$(shell echo $$(($(VERSION) - 1)))"
        @ 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 >> $@
        @ rm $@.tmp
+       head -1 $@ | grep -q "to v$(VERSION)"
+.PHONY: ChangeLog
+.PRECIOUS: ChangeLog
+
+release:
+       $(Q) - rm -f udev-$(VERSION).tar.gz
+       $(Q) - rm -f udev-$(VERSION).tar.bz2
+       head -1 ChangeLog | grep -q "to v$(VERSION)"
+       head -1 RELEASE-NOTES | grep -q "udev $(VERSION)"
+       git commit -a -m "release $(VERSION)"
+       cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
+       @ echo
+       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
+
+dist:
+       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: dist
+
+patch:
+       git diff $(shell echo $$(($(VERSION) - 1))) HEAD > udev-git-HEAD.patch
+.PHONY: patch
 
 gcov-all:
-       $(MAKE) clean all STRIPCMD= USE_GCOV=true
+       $(MAKE) clean all USE_GCOV=true
        @ echo
        @ echo "binaries built with gcov support."
        @ echo "run the tests and analyze with 'make udev_gcov.txt'"