X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=56cab10e2325b59d47a0693a5585ea73260ca8d2;hp=d273ed795c879655aa1b460df0b5fa12d5b7d1eb;hb=79bd4f222954a331aafcd7d0164742a60b570294;hpb=51df9ee4965516b17dcd50647546ee970df87b32

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index d273ed795..56cab10e2 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,15 +1,18 @@
-# Makefile for udev_volume_id
+# Makefile for udev extra invoked from the udev main Makefile
 #
-# Copyright (C) 2004 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 = udev_volume_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,68 +29,42 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-D_FILE_OFFSET_BITS=64
-
-VOLUME_ID_OBJS=					\
-	volume_id/ext/ext.o			\
-	volume_id/fat/fat.o			\
-	volume_id/hfs/hfs.o			\
-	volume_id/highpoint/highpoint.o		\
-	volume_id/iso9660/iso9660.o		\
-	volume_id/jfs/jfs.o			\
-	volume_id/linux_raid/linux_raid.o	\
-	volume_id/linux_swap/linux_swap.o	\
-	volume_id/lvm/lvm.o			\
-	volume_id/mac/mac.o			\
-	volume_id/msdos/msdos.o			\
-	volume_id/ntfs/ntfs.o			\
-	volume_id/reiserfs/reiserfs.o		\
-	volume_id/udf/udf.o			\
-	volume_id/ufs/ufs.o			\
-	volume_id/xfs/xfs.o			\
-	volume_id/dasd/dasd.o			\
-	volume_id/volume_id.o			\
-	volume_id/util.o
-
-VOLUME_ID_HEADERS=				\
-	volume_id/ext/ext.h			\
-	volume_id/fat/fat.h			\
-	volume_id/hfs/hfs.h			\
-	volume_id/highpoint/highpoint.h		\
-	volume_id/iso9660/iso9660.h		\
-	volume_id/jfs/jfs.h			\
-	volume_id/linux_raid/linux_raid.h	\
-	volume_id/linux_swap/linux_swap.h	\
-	volume_id/lvm/lvm.h			\
-	volume_id/mac/mac.h			\
-	volume_id/msdos/msdos.h			\
-	volume_id/ntfs/ntfs.h			\
-	volume_id/reiserfs/reiserfs.h		\
-	volume_id/udf/udf.h			\
-	volume_id/ufs/ufs.h			\
-	volume_id/xfs/xfs.h			\
-	volume_id/dasd/dasd.h			\
-	volume_id/volume_id.h			\
-	volume_id/util.h
-
-OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) $(SYSFS)
-HEADERS = $(VOLUME_ID_HEADERS)
+all: $(PROG) $(MAN_PAGES)
+.PHONY: all
+.DEFAULT: all
 
-$(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) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+# man pages
+%.8: %.xml
+	xmlto man $?
+.PRECIOUS: %.8
 
 clean:
-	rm -f $(PROG) $(OBJS)
+	rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+.PHONY: clean
 
-spotless: clean
-
-install: all
+install-bin: all
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+.PHONY: install-bin
 
-uninstall:
+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