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

Makefiles.

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index ad890255e..de98f494e 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -8,13 +8,14 @@
 # Note 2! The CFLAGS definitions are now in the main makefile.
 
 O_TARGET := proc.o
-O_OBJS   := inode.o root.o base.o generic.o array.o \
-		kmsg.o proc_tty.o proc_misc.o kcore.o
-OX_OBJS  := procfs_syms.o
-M_OBJS   := 
+
+export-objs := procfs_syms.o
+
+obj-y    := inode.o root.o base.o generic.o array.o \
+		kmsg.o proc_tty.o proc_misc.o kcore.o procfs_syms.o
 
 ifeq ($(CONFIG_PROC_DEVICETREE),y)
-O_OBJS += proc_devtree.o
+obj-y += proc_devtree.o
 endif
 
 include $(TOPDIR)/Rules.make