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

Next file: linux/drivers/atm/ambassador.c
Previous file: linux/drivers/atm/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/atm/Makefile linux/drivers/atm/Makefile
@@ -4,96 +4,27 @@
 #
 
 O_TARGET := atm.o
-O_OBJS	 := atmdev_init.o
-M_OBJS	 :=
 
-include ../../.config
+export-objs := uPD98402.o suni.o idt77105.o
 
-ifeq ($(CONFIG_ATM_ENI),y)
-O_OBJS += eni.o
-NEED_SUNI_LX = suni.o
-else
-  ifeq ($(CONFIG_ATM_ENI),m)
-  M_OBJS += eni.o
-  NEED_SUNI_MX = suni.o
-  endif
-endif
+obj-y := atmdev_init.o
 
-ifeq ($(CONFIG_ATM_ZATM),y)
-O_OBJS += zatm.o
-OX_OBJS += uPD98402.o
-else
-  ifeq ($(CONFIG_ATM_ZATM),m)
-  M_OBJS += zatm.o
-  MX_OBJS += uPD98402.o
-  endif
-endif
+obj-$(CONFIG_ATM_ENI) += eni.o suni.o
+obj-$(CONFIG_ATM_ZATM) += zatm.o uPD98402.o
+obj-$(CONFIG_ATM_NICSTAR) += nicstar.o
 
-ifeq ($(CONFIG_ATM_NICSTAR),y)
-O_OBJS += nicstar.o
-  ifeq ($(CONFIG_ATM_NICSTAR_USE_SUNI),y)
-  NEED_SUNI_LX = suni.o
-  endif
-  ifeq ($(CONFIG_ATM_NICSTAR_USE_IDT77105),y)
-  NEED_IDT77105_LX = idt77105.o
-  endif
-else
-  ifeq ($(CONFIG_ATM_NICSTAR),m)
-  M_OBJS += nicstar.o
-    ifeq ($(CONFIG_ATM_NICSTAR_USE_SUNI),y)
-    NEED_SUNI_MX = suni.o
-    endif
-    ifeq ($(CONFIG_ATM_NICSTAR_USE_IDT77105),y)
-    NEED_IDT77105_MX = idt77105.o
-    endif
-  endif
+ifeq ($(CONFIG_ATM_NICSTAR_USE_SUNI),y)
+  obj-$(CONFIG_ATM_NICSTAR) += suni.o
 endif
 
-ifeq ($(CONFIG_ATM_HORIZON),y)
-O_OBJS += horizon.o
-else
-  ifeq ($(CONFIG_ATM_HORIZON),m)
-  M_OBJS += horizon.o
-  endif
+ifeq ($(CONFIG_ATM_NICSTAR_USE_IDT77105),y)
+  obj-$(CONFIG_ATM_NICSTAR) += idt77105.o
 endif
 
-ifeq ($(CONFIG_ATM_AMBASSADOR),y)
-O_OBJS += ambassador.o
-else
-  ifeq ($(CONFIG_ATM_AMBASSADOR),m)
-  M_OBJS += ambassador.o
-  endif
-endif
-
-ifeq ($(CONFIG_ATM_TCP),y)
-O_OBJS += atmtcp.o
-else
-  ifeq ($(CONFIG_ATM_TCP),m)
-  M_OBJS += atmtcp.o
-  endif
-endif
-
-ifeq ($(CONFIG_ATM_IA),y)
-O_OBJS += iphase.o
-NEED_SUNI_LX = suni.o
-else
-ifeq ($(CONFIG_ATM_IA),m)
-  M_OBJS += iphase.o
-  NEED_SUNI_MX = suni.o
-  endif
-endif
-
-ifeq ($(NEED_SUNI_LX),)
-  MX_OBJS += $(NEED_SUNI_MX)
-else
-  OX_OBJS += $(NEED_SUNI_LX)
-endif
-
-ifeq ($(NEED_IDT77105_LX),)
-  MX_OBJS += $(NEED_IDT77105_MX)
-else
-  OX_OBJS += $(NEED_IDT77105_LX)
-endif
+obj-$(CONFIG_ATM_HORIZON) += horizon.o
+obj-$(CONFIG_ATM_AMBASSADOR) += ambassador.o
+obj-$(CONFIG_ATM_TCP) += atmtcp.o
+obj-$(CONFIG_ATM_IA) += iphase.o suni.o
 
 ifeq ($(CONFIG_ATM_FORE200E_PCA),y)
   FORE200E_FW_OBJS += fore200e_pca_fw.o
@@ -114,13 +45,8 @@
     CONFIG_ATM_FORE200E_SBA_FW := sba200e_ecd.bin2
   endif
 endif
-ifeq ($(CONFIG_ATM_FORE200E),y)
-  O_OBJS += fore200e.o $(FORE200E_FW_OBJS)
-else
-  ifeq ($(CONFIG_ATM_FORE200E),m)
-    M_OBJS += fore_200e.o
-  endif
-endif
+
+obj-$(CONFIG_ATM_FORE200E) += fore200e.o $(FORE200E_FW_OBJS)
 
 EXTRA_CFLAGS=-g
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)