# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-VERSION = 069
+VERSION = 083
# set this to make use of syslog
USE_LOG = true
DEBUG = false
# compile with gcc's code coverage option
-# (use it with DEBUG, works only with glibc)
USE_GCOV = false
# include Security-Enhanced Linux support
# to build any of the extras programs pass:
# make EXTRAS="extras/<extra1> extras/<extra2>"
-EXTRAS=
+EXTRAS =
-# make the build silent. Set this to something else to make it noisy again.
-V=false
+# make the build silent.
+V = false
PROGRAMS = \
udev \
udevd \
udevsend \
- udevrulescompile \
- udevinitsend \
- udeveventrecorder \
udevcontrol \
udevmonitor \
udevinfo \
HEADERS = \
udev.h \
- udev_utils.h \
udev_rules.h \
- udev_db.h \
- udev_sysfs.h \
logging.h \
udev_libc_wrapper.h \
udev_selinux.h \
list.h
UDEV_OBJS = \
- udev_event.o \
udev_device.o \
udev_config.o \
udev_add.o \
udev_remove.o \
- udev_sysfs.o \
udev_db.o \
+ udev_sysfs.o \
udev_rules.o \
udev_rules_parse.o \
udev_utils.o \
LIBUDEV = libudev.a
MAN_PAGES = \
- udev.8 \
+ udev.7 \
udevmonitor.8 \
udevd.8 \
udevsend.8 \
udevinfo.8 \
udevstart.8
-SYSFS_OBJS = \
- libsysfs/sysfs_class.o \
- libsysfs/sysfs_device.o \
- libsysfs/sysfs_dir.o \
- libsysfs/sysfs_driver.o \
- libsysfs/sysfs_utils.o \
- libsysfs/dlist.o
-LIBSYSFS = libsysfs/libsysfs.a
-
-# config files automatically generated
-GEN_CONFIGS = \
- $(LOCAL_CFG_DIR)/udev.conf
-
GEN_HEADERS = \
udev_version.h
-# override this to make udev look in a different location for it's config files
prefix =
-exec_prefix = ${prefix}
etcdir = ${prefix}/etc
-sbindir = ${exec_prefix}/sbin
-usrbindir = ${exec_prefix}/usr/bin
-usrsbindir = ${exec_prefix}/usr/sbin
+sbindir = ${prefix}/sbin
+usrbindir = ${prefix}/usr/bin
+usrsbindir = ${prefix}/usr/sbin
+libudevdir = ${prefix}/lib/udev
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev
udevdir = /dev
-udevdb = ${udevdir}/.udevdb
-LOCAL_CFG_DIR = etc/udev
-KERNEL_DIR = /lib/modules/${shell uname -r}/build
-srcdir = .
DESTDIR =
-RELEASE_NAME = udev-$(VERSION)
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
PWD = $(shell pwd)
-# If you are running a cross compiler, you may want to set this
-# to something more interesting, like "arm-linux-". If you want
-# to compile vs uClibc, that can be done here as well.
-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
-CC = $(CROSS)gcc
-LD = $(CROSS)gcc
-AR = $(CROSS)ar
-STRIP = $(CROSS)strip
-RANLIB = $(CROSS)ranlib
+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
-# 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/' \
- -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
-
-# determine the gcc include dir
-GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
+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)
-# determine the libgcc.a filename
-GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
+LDFLAGS = -Wl,-warn-common
-# 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)"; else echo "$(2)"; fi;}
-
-CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \
- -Wstrict-prototypes -Wsign-compare
-CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, )
-CFLAGS += -pipe
-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-
-# use '-Os' optimization if available, else use -O2
-OPTFLAGS := $(call cc-supports, -Os, -O2)
-
-# include our local copy of libsysfs
-CFLAGS += -I$(PWD)/libsysfs/sysfs \
- -I$(PWD)/libsysfs
+OPTFLAGS = -Os
+CFLAGS += $(OPTFLAGS)
ifeq ($(strip $(USE_LOG)),true)
CFLAGS += -DUSE_LOG
endif
-# if DEBUG is enabled, then we do not strip or optimize
+# if DEBUG is enabled, then we do not strip
ifeq ($(strip $(DEBUG)),true)
- CFLAGS += -O1 -g -DDEBUG
- LDFLAGS += -Wl
- STRIPCMD = /bin/true -Since_we_are_debugging
-else
- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer
- LDFLAGS += -s -Wl
- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+ CFLAGS += -DDEBUG
+ STRIPCMD =
endif
ifeq ($(strip $(USE_GCOV)),true)
CFLAGS += -fprofile-arcs -ftest-coverage
- LDFLAGS = -fprofile-arcs
+ LDFLAGS += -fprofile-arcs
endif
-# if our own version of klibc is used, we need to build it
ifeq ($(strip $(USE_KLIBC)),true)
- KLIBC_INSTALL = $(PWD)/klibc/.install
- KLCC = $(KLIBC_INSTALL)/bin/$(CROSS)klcc
+ KLCC = /usr/bin/$(CROSS_COMPILE)klcc
CC = $(KLCC)
LD = $(KLCC)
-else
- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
- LDFLAGS += -Wl,-warn-common
+ V = true
endif
ifeq ($(strip $(USE_SELINUX)),true)
UDEV_OBJS += udev_selinux.o
- LIB_OBJS += -lselinux
+ LIB_OBJS += -lselinux -lsepol
CFLAGS += -DUSE_SELINUX
endif
HOST_PROGS=
endif
-all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
+all: $(PROGRAMS) $(MAN_PAGES)
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) prefix=$(prefix) \
- CC="$(CC)" \
+ $(MAKE) CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
LD="$(LD)" \
LDFLAGS="$(LDFLAGS)" \
STRIPCMD="$(STRIPCMD)" \
LIB_OBJS="$(LIB_OBJS)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
- LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
- KERNEL_DIR="$(KERNEL_DIR)" \
QUIET="$(QUIET)" \
- -C $$target $@; \
+ -C $$target $@ || exit 1; \
done;
.PHONY: all
.DEFAULT: all
.SUFFIXES:
# build the objects
-%.o: %.c $(GEN_HEADERS)
+%.o: %.c $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS)
$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
# "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HOST_PROGS) $(KLCC) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
- $(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
+ $(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
+ifneq ($(STRIPCMD),)
$(QUIET) $(STRIPCMD) $@
+endif
-# our own copy of klibc, it is not used if KLCC is given
-$(KLCC):
- $(MAKE) -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
-.NOTPARALLEL: $(KLCC)
-
-$(UDEV_OBJS): $(KLCC)
$(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
@rm -f $@
$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
$(QUIET) $(RANLIB) $@
-$(SYSFS_OBJS): $(KLCC)
-$(LIBSYSFS): $(HOST_PROGS) $(SYSFS_OBJS)
- @rm -f $@
- $(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
- $(QUIET) $(RANLIB) $@
-
-# generate config files
-$(GEN_CONFIGS):
- sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $@.in > $@
-
-# generate config header file
udev_version.h:
- @echo "Creating udev_version.h"
- @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
+ @echo "/* Generated by make. */" > $@
+ @echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
@echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
- @echo \#define UDEV_DB \"$(udevdb)\" >> $@
- @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_BIN \"$(sbindir)/udev\" >> $@
- @echo \#define UDEVD_BIN \"$(sbindir)/udevd\" >> $@
# man pages
-%.8: docs/%.xml
+%.8 %.7: docs/%.xml
xmlto man $?
.PRECIOUS: %.8
.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) $(GEN_CONFIGS)
- $(MAKE) -C klibc SUBDIRS=klibc clean
+ - 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; \
- $(MAKE) prefix=$(prefix) -C $$target $@; \
+ $(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: clean
-spotless: clean
- $(MAKE) -C klibc SUBDIRS=klibc spotless
- rm -rf klibc/.install
-.PHONY: spotless
-
-release: spotless
- git-tar-tree HEAD $(RELEASE_NAME) | gzip -9v > $(RELEASE_NAME).tar.gz
- @echo "$(RELEASE_NAME).tar.gz created"
+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: $(GEN_CONFIGS)
+install-config:
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
- echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
- $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
+ $(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
fi
@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
echo; \
fi
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) prefix=$(prefix) -C $$target $@; \
+ $(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: install-config
install-man:
- $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+ $(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
- $(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
- $(INSTALL_DATA) -D udevsend.8 $(DESTDIR)$(mandir)/man8/udevsend.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) prefix=$(prefix) -C $$target $@; \
+ $(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: install-man
uninstall-man:
- - rm -f $(mandir)/man8/udev.8
- - rm -f $(mandir)/man8/udevinfo.8
- - rm -f $(mandir)/man8/udevtest.8
- - rm -f $(mandir)/man8/udevstart.8
- - rm -f $(mandir)/man8/udevd.8
- - rm -f $(mandir)/man8/udevmonitor.8
- - rm -f $(mandir)/man8/udevsend.8
- - rm -f $(mandir)/man8/udevcontrol.8
+ - rm -f $(DESTDIR)$(mandir)/man7/udev.7
+ - 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/udevmonitor.8
+ - rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) prefix=$(prefix) -C $$target $@; \
+ $(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: uninstall-man
install-bin:
$(INSTALL) -d $(DESTDIR)$(udevdir)
- $(INSTALL_PROGRAM) -D udev $(DESTDIR)$(sbindir)/udev
$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
- $(INSTALL_PROGRAM) -D udevsend $(DESTDIR)$(sbindir)/udevsend
$(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
- $(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) prefix=$(prefix) -C $$target $@; \
+ $(MAKE) -C $$target $@ || exit 1; \
done;
ifndef DESTDIR
- killall udevd
- - rm -rf $(udevdb)
+ - rm -rf /dev/.udev
- $(sbindir)/udevd --daemon
endif
.PHONY: install-bin
uninstall-bin:
- - rm -f $(sbindir)/udev
- - rm -f $(sbindir)/udevd
- - rm -f $(sbindir)/udevsend
- - rm -f $(sbindir)/udevinitsend
- - rm -f $(sbindir)/udeveventrecoreder
- - rm -f $(sbindir)/udevcontrol
- - rm -f $(sbindir)/udevstart
- - rm -f $(usrsbindir)/udevmonitor
- - rm -f $(usrbindir)/udevinfo
- - rm -f $(usrbindir)/udevtest
- - rm -rf $(udevdb)
+ - rm -f $(DESTDIR)$(sbindir)/udevd
+ - rm -f $(DESTDIR)$(sbindir)/udevcontrol
+ - rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
+ - rm -f $(DESTDIR)$(usrbindir)/udevinfo
+ - rm -f $(DESTDIR)$(usrbindir)/udevtest
+ifndef DESTDIR
- killall udevd
+ - rm -rf /dev/.udev
+endif
@extras="$(EXTRAS)"; for target in $$extras; do \
echo $$target; \
- $(MAKE) prefix=$(prefix) -C $$target $@; \
+ $(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: uninstall-bin
.PHONY: test tests
buildtest:
- ./test/simple-build-check.sh
+ test/simple-build-check.sh
.PHONY: buildtest
+ChangeLog: Makefile
+ @ mv $@ $@.tmp
+ @ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@
+ @ echo "============================================" >> $@
+ @ echo >> $@
+ @ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog >> $@
+ @ echo >> $@
+ @ cat $@
+ @ cat $@.tmp >> $@
+ @ rm $@.tmp
+
gcov-all:
- $(MAKE) clean all DEBUG=true USE_GCOV=true
+ $(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'"
echo >> $@; \
done; \
echo "view $@ for the result"
-
~ianmdlvl / elogind.git / blobdiff