patch-2.4.0-test7 linux/drivers/net/irda/Makefile

• Lines: 150
• Date: Sat Aug 12 12:13:10 2000
• Orig file: v2.4.0-test6/linux/drivers/net/irda/Makefile
• Orig date: Wed Aug 9 19:19:50 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/net/irda/Makefile linux/drivers/net/irda/Makefile
@@ -1,121 +1,40 @@
-# File: drivers/irda/Makefile
 #
 # Makefile for the Linux IrDA infrared port device drivers.
 #
+# 9 Aug 2000, Christoph Hellwig <hch@caldera.de>
+# Rewritten to use lists instead of if-statements.
+#
 
 SUB_DIRS     := 
 MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS)
 
-L_TARGET := irda_drivers.a
-L_OBJS   := 
-M_OBJS   :=
-
-ifeq ($(CONFIG_IRTTY_SIR),y)
-L_OBJS += irtty.o
-else
-  ifeq ($(CONFIG_IRTTY_SIR),m)
-  M_OBJS += irtty.o
-  endif
-endif
-
-ifeq ($(CONFIG_IRPORT_SIR),y)
-LX_OBJS += irport.o
-else
-  ifeq ($(CONFIG_IRPORT_SIR),m)
-  MX_OBJS += irport.o
-  endif
-endif
-
-ifeq ($(CONFIG_NSC_FIR),y)
-L_OBJS += nsc-ircc.o
-else
-  ifeq ($(CONFIG_NSC_FIR),m)
-  M_OBJS += nsc-ircc.o
-  endif
-endif
-
-ifeq ($(CONFIG_WINBOND_FIR),y)
-L_OBJS += w83977af_ir.o
-else
-  ifeq ($(CONFIG_WINBOND_FIR),m)
-  M_OBJS += w83977af_ir.o
-  endif
-endif
-
-ifeq ($(CONFIG_TOSHIBA_FIR),y)
-L_OBJS += toshoboe.o
-else
-  ifeq ($(CONFIG_TOSHIBA_FIR),m)
-  M_OBJS += toshoboe.o
-  endif
-endif
-
-ifeq ($(CONFIG_SMC_IRCC_FIR),y)
-L_OBJS += smc-ircc.o
-LX_OBJS += irport.o
-else
-  ifeq ($(CONFIG_SMC_IRCC_FIR),m)
-  M_OBJS += smc-ircc.o
-  MX_OBJS += irport.o
-  endif
-endif
-
-ifeq ($(CONFIG_ESI_DONGLE),y)
-L_OBJS += esi.o
-else
-  ifeq ($(CONFIG_ESI_DONGLE),m)
-  M_OBJS += esi.o
-  endif
-endif
-
-ifeq ($(CONFIG_TEKRAM_DONGLE),y)
-L_OBJS += tekram.o
-else
-  ifeq ($(CONFIG_TEKRAM_DONGLE),m)
-  M_OBJS += tekram.o
-  endif
-endif
-
-ifeq ($(CONFIG_ACTISYS_DONGLE),y)
-L_OBJS += actisys.o
-else
-  ifeq ($(CONFIG_ACTISYS_DONGLE),m)
-  M_OBJS += actisys.o
-  endif
-endif
-
-ifeq ($(CONFIG_GIRBIL_DONGLE),y)
-L_OBJS += girbil.o
-else
-  ifeq ($(CONFIG_GIRBIL_DONGLE),m)
-  M_OBJS += girbil.o
-  endif
-endif
-
-ifeq ($(CONFIG_LITELINK_DONGLE),y)
-L_OBJS += litelink.o
-else
-  ifeq ($(CONFIG_LITELINK_DONGLE),m)
-  M_OBJS += litelink.o
-  endif
-endif
-
-ifeq ($(CONFIG_OLD_BELKIN_DONGLE),y)
-L_OBJS += old_belkin.o
-else
-  ifeq ($(CONFIG_OLD_BELKIN_DONGLE),m)
-  M_OBJS += old_belkin.o
-  endif
-endif
-
-include $(TOPDIR)/Rules.make
-
-clean:
-	rm -f core *.o *.a *.s
-
-
+O_TARGET := irda.o
 
+export-objs	= irport.o
 
 
+obj-$(CONFIG_IRTTY_SIR)		+= irtty.o
+obj-$(CONFIG_IRPORT_SIR)	+= 		irport.o
+obj-$(CONFIG_NSC_FIR)		+= nsc-ircc.o
+obj-$(CONFIG_WINBOND_FIR)	+= w83977af_ir.o
+obj-$(CONFIG_TOSHIBA_FIR)	+= toshoboe.o
+obj-$(CONFIG_SMC_IRCC_FIR)	+= smc-ircc.o	irport.o
+obj-$(CONFIG_ESI_DONGLE)	+= esi.o
+obj-$(CONFIG_TEKRAM_DONGLE)	+= tekram.o
+obj-$(CONFIG_ACTISYS_DONGLE)	+= actisys.o
+obj-$(CONFIG_GIRBIL_DONGLE)	+= girbil.o
+obj-$(CONFIG_LITELINK_DONGLE)	+= litelink.o
+obj-$(CONFIG_OLD_BELKIN_DONGLE)	+= old_belkin.o
+
+
+# Files that are both resident and modular: remove from modular.
+obj-m		:= $(filter-out $(obj-y), $(obj-m))
+
+# Translate to Rules.make lists.
+O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
+OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
+M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
+MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
 
+include $(TOPDIR)/Rules.make