summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-10-14 00:38:08 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:58:15 -0700
commitc008fe93f5252d47f82d7f00e423983bda9ce1e3 (patch)
treee3733ba024f8db6a9357823428445263ba49de49
parente457f010b1360ce92a26018a933eefaaed03d520 (diff)
[PATCH] fix up error in building extras and libsysfs
-rw-r--r--Makefile1
-rw-r--r--extras/scsi_id/Makefile8
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e51a050926..1f9578e7f4 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,6 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS)
echo $$target ; \
$(MAKE) prefix=$(prefix) \
LD="$(LD)" \
- SYSFS="$(SYSFS)" \
KERNEL_DIR="$(KERNEL_DIR)" \
-C $$target $@ ; \
done ; \
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 7ccc4c5118..6a73e33785 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -31,8 +31,14 @@ INSTALL_DATA = ${INSTALL} -m 644
override 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.
#