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

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8813f9fca..8605811cf 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,19 +28,18 @@ 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
+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
 
 
 
@@ -49,8 +48,11 @@ HEADERS = volume_id.h dasdlabel.h
 
 $(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 +60,8 @@ 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)