patch-2.4.0-prerelease linux/drivers/pnp/Makefile

• Lines: 39
• Date: Fri Dec 29 14:07:22 2000
• Orig file: v2.4.0-test12/linux/drivers/pnp/Makefile
• Orig date: Wed Jan 26 12:35:07 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/pnp/Makefile linux/drivers/pnp/Makefile
@@ -8,30 +8,17 @@
 # Note 2! The CFLAGS definitions are now inherited from the
 # parent makes..
 
-SUB_DIRS     := 
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
+O_TARGET := pnp.o
 
-PROC_OBJS :=
+export-objs := isapnp.o
+multi-objs := isa-pnp.o
 
-ifdef CONFIG_PROC_FS
-PROC_OBJS   += isapnp_proc.o
-endif
-
-ifeq ($(CONFIG_ISAPNP),m)
-	M_OBJS   := isa-pnp.o
-	MIX_OBJS := isapnp.o
-	MI_OBJS  := quirks.o $(PROC_OBJS)
-endif
-
-ifeq ($(CONFIG_ISAPNP),y)
-	O_TARGET := pnp.o
-	OX_OBJS  := isapnp.o
-	O_OBJS   := quirks.o $(PROC_OBJS)
-endif
+proc-$(CONFIG_PROC_FS) = isapnp_proc.o
+isa-pnp-objs := isapnp.o quirks.o $(proc-y)
 
+obj-$(CONFIG_ISAPNP) += isa-pnp.o
 
 include $(TOPDIR)/Rules.make
 
-isa-pnp.o: $(MIX_OBJS) $(MI_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) $(MI_OBJS)
+isa-pnp.o: $(isa-pnp-objs)
+	$(LD) $(LD_RFLAG) -r -o $@ $(isa-pnp-objs)