X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=bb4f6d42391d46e44fe3598ef41692758e8041db;hp=f69ac96e9d61e469b1af210dff3e3cb55a065e18;hb=7155bfb7fa7d72bc4e7341ad1481ffd4c6e39f97;hpb=cf686d37b42ed49df9209d6630fd3292c54c6bde

diff --git a/Makefile b/Makefile
index f69ac96e9..bb4f6d423 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 071
+VERSION = 081
 
 # set this to make use of syslog
 USE_LOG = true
@@ -50,9 +50,6 @@ PROGRAMS = \
 	udev				\
 	udevd				\
 	udevsend			\
-	udevrulescompile		\
-	udevinitsend			\
-	udeveventrecorder		\
 	udevcontrol			\
 	udevmonitor			\
 	udevinfo			\
@@ -61,23 +58,19 @@ PROGRAMS = \
 
 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			\
@@ -96,15 +89,6 @@ MAN_PAGES = \
 	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
@@ -112,19 +96,16 @@ GEN_CONFIGS = \
 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
 DESTDIR =
 
 INSTALL = /usr/bin/install -c
@@ -142,26 +123,17 @@ HOSTCC = gcc
 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		= -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)
 
 LDFLAGS = -Wl,-warn-common
 
-# use -Os optimization if available, else use -O2
-OPTFLAGS := $(call cc-supports, -Os, -O2)
+OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
 
-# include our local copy of libsysfs
-CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
-		-I$(PWD)/libsysfs
-
 ifeq ($(strip $(USE_LOG)),true)
 	CFLAGS += -DUSE_LOG
 endif
@@ -169,7 +141,7 @@ endif
 # if DEBUG is enabled, then we do not strip
 ifeq ($(strip $(DEBUG)),true)
 	CFLAGS  += -DDEBUG
-	STRIPCMD = /bin/true unstripped binary
+	STRIPCMD =
 endif
 
 ifeq ($(strip $(USE_GCOV)),true)
@@ -179,8 +151,7 @@ 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)
 	V = true
@@ -205,7 +176,7 @@ else
 	HOST_PROGS=
 endif
 
-all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
+all: $(PROGRAMS) $(MAN_PAGES)
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
 		$(MAKE) CC="$(CC)" \
@@ -215,10 +186,8 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
 			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
@@ -227,35 +196,21 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
 .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
-.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 > $@
@@ -265,12 +220,8 @@ udev_version.h:
 	@echo "Creating udev_version.h"
 	@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
@@ -282,6 +233,7 @@ ccdv: ccdv.c
 .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
@@ -289,13 +241,10 @@ clean:
 	- 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) -C $$target $@; \
+		$(MAKE) -C $$target $@ || exit 1; \
 	done;
-	$(MAKE) -C klibc SUBDIRS=klibc spotless
-	rm -rf klibc/.install
 .PHONY: clean
 
 release:
@@ -316,7 +265,7 @@ install-config: $(GEN_CONFIGS)
 	fi
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) -C $$target $@; \
+		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: install-config
 
@@ -331,7 +280,7 @@ install-man:
 	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) -C $$target $@; \
+		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: install-man
 
@@ -346,7 +295,7 @@ uninstall-man:
 	- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) -C $$target $@; \
+		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: uninstall-man
 
@@ -362,11 +311,11 @@ install-bin:
 	$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) -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
@@ -375,8 +324,6 @@ uninstall-bin:
 	- 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
@@ -384,11 +331,11 @@ uninstall-bin:
 	- rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest
 ifndef DESTDIR
 	- killall udevd
-	- rm -rf $(udevdb)
+	- rm -rf /dev/.udev
 endif
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) -C $$target $@; \
+		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: uninstall-bin
 
@@ -404,9 +351,20 @@ test tests: all
 .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 STRIPCMD= USE_GCOV=true
 	@echo