patch-2.4.0-prerelease linux/drivers/net/pcmcia/Makefile

• Lines: 32
• Date: Fri Dec 29 14:07:22 2000
• Orig file: v2.4.0-test12/linux/drivers/net/pcmcia/Makefile
• Orig date: Sun Aug 6 11:23:40 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/net/pcmcia/Makefile linux/drivers/net/pcmcia/Makefile
@@ -4,10 +4,6 @@
 # Makefile for the Linux PCMCIA network device drivers.
 #
 
-SUB_DIRS     := 
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
-
 O_TARGET := pcmcia_net.o
 
 obj-y		:=
@@ -39,16 +35,11 @@
 
 obj-$(CONFIG_PCMCIA_IBMTR)	+= ibmtr_cs.o
 
-O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
-OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
-M_OBJS		:= $(filter-out $(export-objs), $(obj-m))
-MX_OBJS		:= $(filter     $(export-objs), $(obj-m))
-
 include $(TOPDIR)/Rules.make
 
-.ibmtr.o: ../tokenring/ibmtr.c
+tmp-ibmtr.o: ../tokenring/ibmtr.c
 	$(CC) $(CFLAGS) -D__NO_VERSION__ -DPCMCIA -c -o $@ ../tokenring/ibmtr.c
 
-ibmtr_cs.o: .ibmtr.o ibmtr_cs.c
-	$(CC) $(CFLAGS) -DPCMCIA -c -o .$@ ibmtr_cs.c
-	$(LD) -r -o $@ .$@ .ibmtr.o
+ibmtr_cs.o: tmp-ibmtr.o ibmtr_cs.c
+	$(CC) $(CFLAGS) -DPCMCIA -c -o tmp-$@ ibmtr_cs.c
+	$(LD) -r -o $@ tmp-$@ tmp-ibmtr.o