X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=f69ac96e9d61e469b1af210dff3e3cb55a065e18;hb=c895fd002763d6ae808e820020dc54e74c347fc2;hp=95b657c47ca8e3906fb3f12ec840c4c7f0a0f9d0;hpb=a2c7b2173ab1c365157d07795a58a5e37a083c04;p=elogind.git

diff --git a/Makefile b/Makefile
index 95b657c47..f69ac96e9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION =	069
+VERSION = 071
 
 # set this to make use of syslog
 USE_LOG = true
@@ -28,7 +28,6 @@ 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
@@ -42,10 +41,10 @@ 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				\
@@ -126,9 +125,7 @@ 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}
@@ -136,40 +133,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	\
@@ -179,20 +166,15 @@ 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 = /bin/true unstripped binary
 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
@@ -201,14 +183,12 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	KLCC		= $(KLIBC_INSTALL)/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
 
@@ -228,8 +208,12 @@ endif
 all: $(KLCC) $(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)" \
@@ -243,7 +227,7 @@ 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
@@ -258,7 +242,6 @@ $(KLCC):
 			 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)
@@ -305,21 +288,19 @@ clean:
 	- find -name "*.gcov" -print0 | xargs -0rt rm -f
 	- rm -f udev_gcov.txt
 	- rm -f core $(PROGRAMS) $(GEN_HEADERS) $(GEN_CONFIGS)
+	- rm -f udev-$(VERSION).tar.gz
 	$(MAKE) -C klibc SUBDIRS=klibc clean
 	@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
+.PHONY: clean
 
-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)
@@ -333,6 +314,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:
@@ -344,17 +329,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:
@@ -367,33 +360,35 @@ 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)/udevinitsend
+	- rm -f $(DESTDIR)$(sbindir)/udeveventrecoreder
+	- 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
 
@@ -413,7 +408,7 @@ buildtest:
 .PHONY: buildtest
 
 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'"