[packages/kernel.git] / atm-01-Makefile.patch

--- linux-2.4.20/net/atm/Makefile.orig	Sat Aug  3 02:39:46 2002
+++ linux-2.4.20/net/atm/Makefile	Wed Mar  5 23:15:50 2003
@@ -14,32 +14,18 @@
 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 ipcommon.o
 
-ifeq ($(CONFIG_ATM_CLIP),y)
-obj-y += clip.o
-NEED_IPCOM = ipcommon.o
+ifeq ($(CONFIG_ATM),m)
+obj-m += $(O_TARGET)
 endif
 
-ifeq ($(CONFIG_ATM_BR2684),y)
-  NEED_IPCOM = ipcommon.o
-else
-  ifeq ($(CONFIG_ATM_BR2684),m)
-	NEED_IPCOM = ipcommon.o
-  endif
-endif
-obj-$(CONFIG_ATM_BR2684) += br2684.o
-
-ifeq ($(CONFIG_NET_SCH_ATM),y)
-NEED_IPCOM = ipcommon.o
-endif
-
-obj-y += $(NEED_IPCOM)
-
 ifeq ($(CONFIG_PROC_FS),y)
 obj-y += proc.o
 endif
 
+obj-$(CONFIG_ATM_CLIP) += clip.o
+obj-$(CONFIG_ATM_BR2684) += br2684.o
 obj-$(CONFIG_ATM_LANE) += lec.o
 obj-$(CONFIG_ATM_MPOA) += mpoa.o
 obj-$(CONFIG_PPPOATM) += pppoatm.o
Commit	Line	Data
b5a39c4d JR	1	--- linux-2.4.20/net/atm/Makefile.orig Sat Aug 3 02:39:46 2002
	2	+++ linux-2.4.20/net/atm/Makefile Wed Mar 5 23:15:50 2003
	3	@@ -14,32 +14,18 @@
	4	list-multi := mpoa.o
	5	mpoa-objs := mpc.o mpoa_caches.o mpoa_proc.o
	6
	7	-obj-$(CONFIG_ATM) := addr.o pvc.o signaling.o svc.o common.o atm_misc.o raw.o resources.o
	8	+obj-y := addr.o pvc.o signaling.o svc.o common.o atm_misc.o raw.o resources.o ipcommon.o
	9
	10	-ifeq ($(CONFIG_ATM_CLIP),y)
	11	-obj-y += clip.o
	12	-NEED_IPCOM = ipcommon.o
	13	+ifeq ($(CONFIG_ATM),m)
	14	+obj-m += $(O_TARGET)
	15	endif
	16
	17	-ifeq ($(CONFIG_ATM_BR2684),y)
	18	- NEED_IPCOM = ipcommon.o
	19	-else
	20	- ifeq ($(CONFIG_ATM_BR2684),m)
	21	- NEED_IPCOM = ipcommon.o
	22	- endif
	23	-endif
	24	-obj-$(CONFIG_ATM_BR2684) += br2684.o
	25	-
	26	-ifeq ($(CONFIG_NET_SCH_ATM),y)
	27	-NEED_IPCOM = ipcommon.o
	28	-endif
	29	-
	30	-obj-y += $(NEED_IPCOM)
	31	-
	32	ifeq ($(CONFIG_PROC_FS),y)
	33	obj-y += proc.o
	34	endif
	35
	36	+obj-$(CONFIG_ATM_CLIP) += clip.o
	37	+obj-$(CONFIG_ATM_BR2684) += br2684.o
	38	obj-$(CONFIG_ATM_LANE) += lec.o
	39	obj-$(CONFIG_ATM_MPOA) += mpoa.o
	40	obj-$(CONFIG_PPPOATM) += pppoatm.o