[PATCH] clean up net/802/Makefile (small version)

[PATCH] clean up net/802/Makefile (small version)

[Jörn Engel]

This patch simply removes a couple of lines with duplicated
functionality. Patch is against 2.4.20.

Arnaldo, are you the correct maintainer for this?

Jörn

-- 
Victory in war is not repetitious.
-- Sun Tzu

--- linux-2.4.20/net/802/Makefile	Sat Aug  3 02:39:46 2002
+++ linux-2.4.20/net/802/Makefile.1	Thu Mar 20 23:20:05 2003
@@ -15,13 +15,9 @@
 
 obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
 obj-$(CONFIG_LLC) += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
-ifeq ($(CONFIG_SYSCTL),y)
-obj-y += sysctl_net_802.o
-endif
 
 ifeq ($(CONFIG_LLC),y)
 subdir-y += transit
-obj-y += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
 SNAP = y
 endif
 

Re: [PATCH] clean up net/802/Makefile (large version)

[Jörn Engel]

This one tries to clean up the other code as well.

Jörn

-- 
The cheapest, fastest and most reliable components of a computer
system are those that aren't there.
-- Gordon Bell, DEC labratories

--- linux-2.4.20/net/802/Makefile	Sat Aug  3 02:39:46 2002
+++ linux-2.4.20/net/802/Makefile.2	Thu Mar 20 23:26:22 2003
@@ -11,48 +11,26 @@
 
 export-objs = llc_macinit.o p8022.o psnap.o
 
+snap-objs = p8022.o psnap.o
+
 obj-y	= p8023.o
 
 obj-$(CONFIG_SYSCTL) += sysctl_net_802.o
-obj-$(CONFIG_LLC) += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
-ifeq ($(CONFIG_SYSCTL),y)
-obj-y += sysctl_net_802.o
-endif
-
-ifeq ($(CONFIG_LLC),y)
-subdir-y += transit
-obj-y += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
-SNAP = y
-endif
-
-ifdef CONFIG_TR
-obj-y += tr.o
-	SNAP=y
-endif
-
-ifdef CONFIG_NET_FC
-obj-y += fc.o
-endif
-
-ifdef CONFIG_FDDI
-obj-y += fddi.o
-endif
-
-ifdef CONFIG_HIPPI
-obj-y += hippi.o
-endif
-
-ifdef CONFIG_IPX
-	SNAP=y
-endif
-
-ifdef CONFIG_ATALK
-	SNAP=y
-endif
-
-ifeq ($(SNAP),y)
-obj-y += p8022.o psnap.o
-endif
+obj-$(CONFIG_LLC) += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o $(snap-objs)
+
+subdir-$(CONFIG_LLC) += transit
+
+obj-$(CONFIG_TR) += tr.o $(snap-objs)
+
+obj-$(CONFIG_NET_FC) += fc.o
+
+obj-$(CONFIG_FDDI) += fddi.o
+
+obj-$(CONFIG_HIPPI) += hippi.o
+
+obj-$(CONFIG_IPX) += $(snap-objs)
+
+obj-$(CONFIG_ATALK) += $(snap-objs)
 
 include $(TOPDIR)/Rules.make