*_id: fix zero length in set_str()

[elogind.git] / extras / scsi_id / Makefile

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 6a73e33785545ff0cfec30c4718b880fd0e5d345..24c1b3212824467d8937e716a37da4d4e5b78462 100644 (file)
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-SCSI_ID_VERSION=0.6
+SCSI_ID_VERSION=0.9
 
 prefix =
 etcdir =        ${prefix}/etc
@@ -28,17 +28,11 @@ INSTALL_DATA  = ${INSTALL} -m 644
 # Note some of the variables used here are set when built under udev, and
 # otherwise might not be set.
 
-override CFLAGS+=-Wall -fno-builtin
+CFLAGS+=-Wall -fno-builtin
 
 PROG=scsi_id
+SYSFS=-lsysfs
 
-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
 #
 # Built static and stripped when built with udev.
 #
@@ -78,5 +72,9 @@ clean:
 
 spotless: clean
 
+.c.o:
+       $(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+
 $(PROG):       $(OBJS)
-       $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+