patch-2.4.22 linux-2.4.22/net/atm/Makefile

Next file: linux-2.4.22/net/atm/addr.c
Previous file: linux-2.4.22/net/README
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/net/atm/Makefile linux-2.4.22/net/atm/Makefile
@@ -14,12 +14,15 @@
 list-multi	:= mpoa.o
 mpoa-objs	:= mpc.o mpoa_caches.o mpoa_proc.o
 
-obj-$(CONFIG_ATM) := addr.o pvc.o signaling.o svc.o common.o atm_misc.o raw.o resources.o
+obj-y		:= addr.o pvc.o signaling.o svc.o common.o atm_misc.o raw.o resources.o
+ifeq ($(CONFIG_ATM),m)
+  obj-m += $(O_TARGET)
+endif
 
-ifeq ($(CONFIG_ATM_CLIP),y)
-obj-y += clip.o
-NEED_IPCOM = ipcommon.o
+ifneq ($(CONFIG_ATM_CLIP),n)
+  NEED_IPCOM = ipcommon.o
 endif
+obj-$(CONFIG_ATM_CLIP) += clip.o
 
 ifeq ($(CONFIG_ATM_BR2684),y)
   NEED_IPCOM = ipcommon.o
@@ -31,13 +34,13 @@
 obj-$(CONFIG_ATM_BR2684) += br2684.o
 
 ifeq ($(CONFIG_NET_SCH_ATM),y)
-NEED_IPCOM = ipcommon.o
+  NEED_IPCOM = ipcommon.o
 endif
 
 obj-y += $(NEED_IPCOM)
 
 ifeq ($(CONFIG_PROC_FS),y)
-obj-y += proc.o
+  obj-y += proc.o
 endif
 
 obj-$(CONFIG_ATM_LANE) += lec.o

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