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

Makefiles.

1 files changed, 21 insertions, 13 deletions

diff --git a/drivers/isdn/divert/Makefile b/drivers/isdn/divert/Makefile
index 109c900d8..dc1084cb6 100644
--- a/drivers/isdn/divert/Makefile
+++ b/drivers/isdn/divert/Makefile
@@ -1,19 +1,27 @@
-L_OBJS :=
-LX_OBJS :=
-M_OBJS :=
-MX_OBJS :=
-O_OBJS :=
-OX_OBJS :=
-L_TARGET :=
-O_TARGET :=
-
-O_OBJS += isdn_divert.o divert_procfs.o
-O_TARGET := dss1_divert.o
-M_OBJS += dss1_divert.o
-OX_OBJS += divert_init.o
+#
+# Makefile for the dss1_divert ISDN module
+#
+
+# The target object and module list name.
+
+O_TARGET	:= vmlinux-obj.o
+
+# Multipart objects.
+
+list-multi		:= dss1_divert.o
+dss1_divert-objs	:= isdn_divert.o divert_procfs.o divert_init.o
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN_DIVERSION)	+= dss1_divert.o
 
 include $(TOPDIR)/Rules.make
 
+# Link rules for multi-part drivers.
+
+dss1_divert.o: $(dss1_divert-objs)
+	$(LD) -r -o $@ $(dss1_divert-objs)
+