EXTRAS: cleanup and sync all Makefiles

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

1 files changed, 38 insertions, 22 deletions

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index c1dd74f0f7..56cab10e23 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,15 +1,18 @@
-# Makefile for volume_id
+# Makefile for udev extra invoked from the udev main Makefile
 #
-# Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
+# Released under the GNU General Public License, version 2.
 #
 
-PROG = vol_id
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
 
-all:	$(PROG)
+PROG = vol_id
+OBJS = $(VOLUME_ID_OBJS)
+HEADERS = $(VOLUME_ID_HEADERS)
+GEN_HEADERS =
+MAN_PAGES =
 
 prefix =
 exec_prefix =	${prefix}
@@ -18,9 +21,7 @@ sbindir =	${exec_prefix}/sbin
 usrbindir =	${exec_prefix}/usr/bin
 usrsbindir =	${exec_prefix}/usr/sbin
 mandir =	${prefix}/usr/share/man
-devddir =	${etcdir}/dev.d/default
 configdir =	${etcdir}/udev/
-initdir = 	${etcdir}/init.d/
 srcdir = .
 
 INSTALL = /usr/bin/install -c
@@ -28,27 +29,42 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-VOLUME_ID_BASE=volume_id
-include $(VOLUME_ID_BASE)/Makefile.inc
+all: $(PROG) $(MAN_PAGES)
+.PHONY: all
+.DEFAULT: all
 
-OBJS = vol_id.o $(VOLUME_ID_OBJS) $(LIBUDEV)
-HEADERS = $(VOLUME_ID_HEADERS)
-
-$(OBJS): $(HEADERS)
+%.o: %.c $(GEN_HEADERS)
+	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
-.c.o:
-	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+$(PROG): %: $(HEADERS) %.o $(OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
 
-$(PROG): $(OBJS) $(HEADERS)
-	$(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS)
+# man pages
+%.8: %.xml
+	xmlto man $?
+.PRECIOUS: %.8
 
 clean:
-	rm -f $(PROG) $(OBJS)
-
-spotless: clean
+	rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+.PHONY: clean
 
 install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+.PHONY: install-bin
 
 uninstall-bin:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
+.PHONY: uninstall-bin
+
+install-man:
+	@echo "Please create a man page for this tool."
+.PHONY: uninstall-man
+
+uninstall-man:
+	@echo "Please create a man page for this tool."
+.PHONY: uninstall-man
+
+install-config:
+	@echo "no config file to install"
+.PHONY: install-config