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

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8813f9fca..efec58f80 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,29 +28,21 @@ 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+=-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-override CFLAGS+=-D_FILE_OFFSET_BITS=64
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
 
-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
+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 +50,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)