X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=f0c15b8fecd4a50090519bccbe3792b8ca298b0e;hp=8813f9fca548dcdf9975519905bd24269a860305;hb=d25e14ae1ef476fdc1d2b690b9426bd45bafd34e;hpb=c506c4087efe567b3cb382bd228644cde3453b04;ds=sidebyside

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8813f9fca..f0c15b8fe 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,29 +28,63 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts -Wmissing-declarations \
-		 -Wnested-externs -Wpointer-arith -Wcast-align \
-		 -Wsign-compare
+override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts \
+		 -Wpointer-arith -Wcast-align -Wsign-compare
 
 override CFLAGS+=-D_FILE_OFFSET_BITS=64
 
-SYSFS =	../../libsysfs/sysfs_bus.o	\
-	../../libsysfs/sysfs_class.o	\
-	../../libsysfs/sysfs_device.o	\
-	../../libsysfs/sysfs_dir.o	\
-	../../libsysfs/sysfs_driver.o	\
-	../../libsysfs/sysfs_utils.o	\
-	../../libsysfs/dlist.o
-
-
-
-OBJS = volume_id.o udev_volume_id.o dasdlabel.o $(SYSFS)
-HEADERS = volume_id.h dasdlabel.h
+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)
 
 $(OBJS): $(HEADERS)
 
+.c.o:
+	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+
 $(PROG): $(OBJS) $(HEADERS)
-	$(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 
 clean:
 	rm -f $(PROG) $(OBJS)
@@ -58,8 +92,7 @@ clean:
 spotless: clean
 
 install: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
 uninstall:
-	- rm $(DESTDIR)$(usrsbindir)/$(PROG)
-
+	- rm $(DESTDIR)$(sbindir)/$(PROG)