X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=3b254f122678d549bf184db931450090d6b5da83;hp=97c3528037bef01a90451f964ec05a655d067736;hb=225cb03bd851adc6d269b13bdf2b1bfded2b96b9;hpb=159ba1c5314b160d7036009eac690fe399c7917d

diff --git a/Makefile b/Makefile
index 97c352803..3b254f122 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 106
+VERSION = 118
 
 # set this to make use of syslog
 USE_LOG = true
@@ -44,14 +44,9 @@ V =
 
 PROGRAMS = \
 	udevd				\
-	udevtrigger			\
-	udevsettle			\
-	udevcontrol			\
-	udevmonitor			\
-	udevinfo			\
-	udevtest			\
-	test-udev			\
-	udevstart
+	udevadm				\
+	udevstart			\
+	test-udev
 
 HEADERS = \
 	udev.h				\
@@ -73,19 +68,19 @@ UDEV_OBJS = \
 	udev_utils.o			\
 	udev_utils_string.o		\
 	udev_utils_file.o		\
-	udev_utils_run.o		\
+	udevmonitor.o			\
+	udevinfo.o			\
+	udevcontrol.o			\
+	udevtrigger.o			\
+	udevsettle.o			\
+	udevtest.o			\
 	udev_sysdeps.o
 LIBUDEV = libudev.a
 
 MAN_PAGES = \
 	udev.7				\
-	udevmonitor.8			\
 	udevd.8				\
-	udevtrigger.8			\
-	udevsettle.8			\
-	udevtest.8			\
-	udevinfo.8			\
-	udevstart.8
+	udevadm.8
 
 GEN_HEADERS = \
 	udev_version.h
@@ -113,13 +108,13 @@ LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 RANLIB = $(CROSS_COMPILE)ranlib
 
-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)
@@ -220,26 +215,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-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
-
 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;
@@ -247,13 +238,14 @@ install-config:
 
 install-man:
 	$(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 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
+	$(INSTALL_DATA) -D udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8
+	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
+	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtest.8
+	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8
+	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevsettle.8
+	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
+	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
@@ -261,6 +253,7 @@ install-man:
 
 uninstall-man:
 	- rm -f $(DESTDIR)$(mandir)/man7/udev.7
+	- rm -f $(DESTDIR)$(mandir)/man8/udevadm.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevtest.8
 	- rm -f $(DESTDIR)$(mandir)/man8/udevd.8
@@ -276,12 +269,15 @@ 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
-	$(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
+	$(INSTALL_PROGRAM) -D udevadm $(DESTDIR)$(sbindir)/udevadm
+	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevtrigger
+	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle
+	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevcontrol
+	mkdir -p -m 0755 $(DESTDIR)$(usrsbindir)
+	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrsbindir)/udevmonitor
+	mkdir -p -m 0755 $(DESTDIR)$(usrbindir)
+	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo
+	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevtest
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
@@ -294,6 +290,7 @@ endif
 
 uninstall-bin:
 	- rm -f $(DESTDIR)$(sbindir)/udevd
+	- rm -f $(DESTDIR)$(sbindir)/udevadm
 	- rm -f $(DESTDIR)$(sbindir)/udevtrigger
 	- rm -f $(DESTDIR)$(sbindir)/udevsettle
 	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
@@ -324,7 +321,8 @@ 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 echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@
 	@ echo "============================================" >> $@
@@ -334,6 +332,30 @@ ChangeLog: Makefile
 	@ 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 USE_GCOV=true