patch-2.3.40 linux/drivers/pnp/Makefile

• Lines: 34
• Date: Thu Jan 13 16:53:52 2000
• Orig file: v2.3.39/linux/drivers/pnp/Makefile
• Orig date: Tue Jan 11 22:31:41 2000

diff -u --recursive --new-file v2.3.39/linux/drivers/pnp/Makefile linux/drivers/pnp/Makefile
@@ -12,16 +12,26 @@
 MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS)
 
-ifeq ($(CONFIG_ISAPNP),m)
-M_OBJS   := isa-pnp.o
+PROC_OBJS :=
+
+ifdef CONFIG_PROC_FS
+PROC_OBJS   += isapnp_proc.o
 endif
 
-O_TARGET := isa-pnp.o
-OX_OBJS  := isapnp.o
-O_OBJS   := quirks.o
+ifeq ($(CONFIG_ISAPNP),m)
+	M_OBJS   := isa-pnp.o
+	MIX_OBJS := isapnp.o
+	MI_OBJS  := quirks.o $(PROC_OBJS)
+endif
 
-ifdef CONFIG_PROC_FS
-O_OBJS   += isapnp_proc.o
+ifeq ($(CONFIG_ISAPNP),y)
+	O_TARGET := isa-pnp.o
+	OX_OBJS  := isapnp.o
+	O_OBJS   := quirks.o $(PROC_OBJS)
 endif
 
+
 include $(TOPDIR)/Rules.make
+
+isa-pnp.o: isapnp.o quirks.o $(PROC_OBJS)
+	$(LD) $(LD_RFLAG) -r -o $@ isapnp.o quirks.o $(PROC_OBJS)