patch-1.3.17 linux/drivers/block/Makefile

Next file: linux/drivers/char/Makefile
Previous file: linux/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.16/linux/drivers/block/Makefile linux/drivers/block/Makefile
@@ -27,7 +27,7 @@
 OBJS := $(OBJS) floppy.o
 SRCS := $(SRCS) floppy.c
 else
-BLOCK_MODULE_OBJS := $(MODULES) floppy.o
+BLOCK_MODULE_OBJS := $(BLOCK_MODULE_OBJS) floppy.o
 endif
 
 ifdef CONFIG_AZTCD
@@ -137,10 +137,13 @@
 	$(AR) rcs block.a $(OBJS)
 	sync
 
+ifdef BLOCK_MODULE_OBJS
 dep:
 	$(CPP) -M $(SRCS) > .depend
-ifdef BLOCK_MODULE_OBJS
 	$(CPP) -M -DMODULE $(BLOCK_MODULE_OBJS:.o=.c) >> .depend
+else
+dep:
+	$(CPP) -M $(SRCS) > .depend
 endif
 
 modules: $(BLOCK_MODULE_OBJS)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this