X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=c68db3b93adc7f9910960cba4cceefb9efd2ba5a;hp=773041b02fdea0147df29856ee03a81fe0a1797f;hb=ef0cd1ac934f10037766d1000e9a6065653688ac;hpb=17d3cb12882f71f19a78beb26054054628423703

diff --git a/Makefile b/Makefile
index 773041b02..c68db3b93 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION =	068
+VERSION = 075
 
 # set this to make use of syslog
 USE_LOG = true
@@ -27,6 +27,9 @@ USE_LOG = true
 #  to print the debug messages to syslog)
 DEBUG = false
 
+# compile with gcc's code coverage option
+USE_GCOV = false
+
 # include Security-Enhanced Linux support
 USE_SELINUX = false
 
@@ -38,18 +41,15 @@ USE_STATIC = false
 
 # 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
+V = false
 
 PROGRAMS = \
 	udev				\
 	udevd				\
 	udevsend			\
-	udevrulescompile		\
-	udevinitsend			\
-	udeveventrecorder		\
 	udevcontrol			\
 	udevmonitor			\
 	udevinfo			\
@@ -121,10 +121,7 @@ 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}
@@ -132,40 +129,30 @@ 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-
+CROSS =
 CC = $(CROSS)gcc
 LD = $(CROSS)gcc
 AR = $(CROSS)ar
-STRIP = $(CROSS)strip
 RANLIB = $(CROSS)ranlib
 HOSTCC = gcc
-
-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS
-
-# 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"}
-
-# determine the libgcc.a filename
-GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
+STRIP = $(CROSS)strip
+STRIPCMD = $(STRIP) -s
 
 # 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
+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
+WARNINGS	+= $(call cc-supports, -Wdeclaration-after-statement, )
+CFLAGS		+= $(WARNINGS)
 
-# use '-Os' optimization if available, else use -O2
+LDFLAGS = -Wl,-warn-common
+
+# use -Os optimization if available, else use -O2
 OPTFLAGS := $(call cc-supports, -Os, -O2)
+CFLAGS += $(OPTFLAGS)
 
 # include our local copy of libsysfs
 CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
@@ -175,31 +162,28 @@ 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
 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)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
 
@@ -216,14 +200,17 @@ else
 	HOST_PROGS=
 endif
 
-all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
+all: $(PROGRAMS) $(MAN_PAGES)
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) prefix=$(prefix) \
+		$(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 $@; \
 	done;
@@ -234,31 +221,23 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
 .SUFFIXES:
 
 # build the objects
-%.o: %.c
+%.o: %.c $(GEN_HEADERS)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 # "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HOST_PROGS) $(KLCC) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
+$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
 	$(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIBSYSFS) $(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)
+$(UDEV_OBJS):
 $(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
 	@rm -f $@
 	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
 	$(QUIET) $(RANLIB) $@
 
-$(SYSFS_OBJS): $(KLCC)
+$(SYSFS_OBJS):
 $(LIBSYSFS): $(HOST_PROGS) $(SYSFS_OBJS)
 	@rm -f $@
 	$(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
@@ -277,7 +256,6 @@ udev_version.h:
 	@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
@@ -291,22 +269,21 @@ ccdv: ccdv.c
 
 clean:
 	- 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 udev-$(VERSION).tar.gz
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) prefix=$(prefix) -C $$target $@; \
+		$(MAKE) -C $$target $@; \
 	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
+	@echo "udev-$(VERSION).tar.gz created"
 .PHONY: release
 
 install-config: $(GEN_CONFIGS)
@@ -320,6 +297,10 @@ install-config: $(GEN_CONFIGS)
 		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; \
+		$(MAKE) -C $$target $@; \
+	done;
 .PHONY: install-config
 
 install-man:
@@ -331,17 +312,25 @@ install-man:
 	$(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) -C $$target $@; \
+	done;
 .PHONY: install-man
 
 uninstall-man:
-	- rm $(mandir)/man8/udev.8
-	- rm $(mandir)/man8/udevinfo.8
-	- rm $(mandir)/man8/udevtest.8
-	- rm $(mandir)/man8/udevstart.8
-	- rm $(mandir)/man8/udevd.8
-	- rm $(mandir)/man8/udevmonitor.8
-	- rm $(mandir)/man8/udevsend.8
-	- rm $(mandir)/man8/udevcontrol.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udev.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevtest.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevstart.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevd.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevsend.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	done;
 .PHONY: uninstall-man
 
 install-bin:
@@ -354,33 +343,33 @@ install-bin:
 	$(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) -C $$target $@; \
+	done;
 ifndef DESTDIR
 	- killall udevd
 	- rm -rf $(udevdb)
 	- $(sbindir)/udevd --daemon
 endif
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		echo $$target; \
-		$(MAKE) prefix=$(prefix) -C $$target $@; \
-	done;
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(sbindir)/udev
-	- rm $(sbindir)/udevd
-	- rm $(sbindir)/udevsend
-	- rm $(sbindir)/udevinitsend
-	- rm $(sbindir)/udeveventrecoreder
-	- rm $(sbindir)/udevcontrol
-	- rm $(sbindir)/udevstart
-	- rm $(usrsbindir)/udevmonitor
-	- rm $(usrbindir)/udevinfo
-	- rm $(usrbindir)/udevtest
-	- rm -rf $(udevdb)
+	- rm -f $(DESTDIR)$(sbindir)/udev
+	- rm -f $(DESTDIR)$(sbindir)/udevd
+	- rm -f $(DESTDIR)$(sbindir)/udevsend
+	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
+	- rm -f $(DESTDIR)$(sbindir)/udevstart
+	- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
+	- rm -f $(usrbindir)/udevinfo
+	- rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest
+ifndef DESTDIR
 	- killall udevd
+	- rm -rf $(udevdb)
+endif
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) prefix=$(prefix) -C $$target $@; \
+		$(MAKE) -C $$target $@; \
 	done;
 .PHONY: uninstall-bin
 
@@ -397,4 +386,28 @@ test tests: all
 
 buildtest:
 	./test/simple-build-check.sh
+.PHONY: buildtest
+
+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'"
+.PHONY: gcov-all
+
+# see docs/README-gcov_for_udev
+udev_gcov.txt: $(wildcard *.gcda) $(wildcard *.gcno)
+	for file in `find -maxdepth 1 -name "*.gcno"`; do \
+		name=`basename $$file .gcno`; \
+		echo "################" >> $@; \
+		echo "$$name.c" >> $@; \
+		echo "################" >> $@; \
+		if [ -e "$$name.gcda" ]; then \
+			gcov -l "$$name.c" >> $@ 2>&1; \
+		else \
+			echo "code for $$name.c was never executed" >> $@ 2>&1; \
+		fi; \
+		echo >> $@; \
+	done; \
+	echo "view $@ for the result"