Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

2 files changed, 16 insertions, 13 deletions

diff --git a/net/802/Makefile b/net/802/Makefile
index 66f8af658..03e484b50 100644
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -8,34 +8,38 @@
 # Note 2! The CFLAGS definition is now in the main makefile...
 
 O_TARGET := 802.o
-O_OBJS	  = p8023.o
 
+export-objs = llc_macinit.o 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)
-O_OBJS += sysctl_net_802.o
+obj-y += sysctl_net_802.o
 endif
 
 ifeq ($(CONFIG_LLC),y)
-SUB_DIRS += transit
-O_OBJS += llc_sendpdu.o llc_utility.o cl2llc.o
-OX_OBJS += llc_macinit.o
+subdir-y += transit
+obj-y += llc_sendpdu.o llc_utility.o cl2llc.o llc_macinit.o
 SNAP = y
 endif
 
 ifdef CONFIG_TR
-O_OBJS += tr.o
+obj-y += tr.o
 	SNAP=y
 endif
 
 ifdef CONFIG_NET_FC
-O_OBJS += fc.o
+obj-y += fc.o
 endif
 
 ifdef CONFIG_FDDI
-O_OBJS += fddi.o
+obj-y += fddi.o
 endif
 
 ifdef CONFIG_HIPPI
-O_OBJS += hippi.o
+obj-y += hippi.o
 endif
 
 ifdef CONFIG_IPX
@@ -47,10 +51,9 @@ ifdef CONFIG_ATALK
 endif
 
 ifeq ($(SNAP),y)
-OX_OBJS += p8022.o psnap.o
+obj-y += p8022.o psnap.o
 endif
 
-
 include $(TOPDIR)/Rules.make
 
 cl2llc.c: cl2llc.pre
diff --git a/net/802/transit/Makefile b/net/802/transit/Makefile
index d2e2e5de4..249369703 100644
--- a/net/802/transit/Makefile
+++ b/net/802/transit/Makefile
@@ -1,3 +1,5 @@
+include $(TOPDIR)/Rules.make
+
 all:	pdutr.h timertr.h
 
 pdutr.h: pdutr.pre compile.awk			
@@ -9,5 +11,3 @@ timertr.h: timertr.pre compile.awk
 clean:
 	touch pdutr.h timertr.h
 	rm pdutr.h timertr.h
-
-