X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=9c274212a653a4d757a8071fbc54881114097595;hb=9d4791b66a7756421fc699be51a7be68a5aed329;hp=8605811cf57381dade48d0a78c8150c622cc4443;hpb=a9ce6041228c12aad06666904af8dbe3acfd3115;p=elogind.git

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8605811cf..9c274212a 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,23 +28,13 @@ 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
 
-override 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
-
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
 
-
-OBJS = volume_id.o udev_volume_id.o dasdlabel.o $(SYSFS)
-HEADERS = volume_id.h dasdlabel.h
+OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) $(SYSFS)
+HEADERS = $(VOLUME_ID_HEADERS)
 
 $(OBJS): $(HEADERS)
 
@@ -64,4 +54,3 @@ install: all
 
 uninstall:
 	- rm $(DESTDIR)$(sbindir)/$(PROG)
-