X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=c1dd74f0f70285b677e462c45be66e20cef137e6;hp=c419e8860fc7dd97722f18594ffcc23ef4a48878;hb=1ac216b198e559163b1c81eca2f1c9a635d8e326;hpb=ff694eca172deb298e806246f6e88bc66235534a

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index c419e8860..c1dd74f0f 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,13 +1,13 @@
-# Makefile for udev_volume_id
+# Makefile for volume_id
 #
-# Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
 #
 
-PROG = udev_volume_id
+PROG = vol_id
 
 all:	$(PROG)
 
@@ -28,23 +28,11 @@ 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
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
 
-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
+OBJS = vol_id.o $(VOLUME_ID_OBJS) $(LIBUDEV)
+HEADERS = $(VOLUME_ID_HEADERS)
 
 $(OBJS): $(HEADERS)
 
@@ -52,16 +40,15 @@ $(OBJS): $(HEADERS)
 	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
 
 $(PROG): $(OBJS) $(HEADERS)
-	$(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS)
 
 clean:
 	rm -f $(PROG) $(OBJS)
 
 spotless: clean
 
-install: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
-
-uninstall:
-	- rm $(DESTDIR)$(usrsbindir)/$(PROG)
+install-bin: all
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
+uninstall-bin:
+	- rm $(DESTDIR)$(sbindir)/$(PROG)