X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=9c274212a653a4d757a8071fbc54881114097595;hp=f0c15b8fecd4a50090519bccbe3792b8ca298b0e;hb=e4d4a557e53c3fbcf14bd1bb29686fd884905b53;hpb=c033fd9f01b3cd5771875069c26d3af06969a300

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index f0c15b8fe..9c274212a 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,52 +28,10 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts \
-		 -Wpointer-arith -Wcast-align -Wsign-compare
-
 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
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
 
 OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) $(SYSFS)
 HEADERS = $(VOLUME_ID_HEADERS)