Fix the Makefile cleanups

diff --git a/drivers/message/Makefile b/drivers/message/Makefile
index 1c5485ae852e3b0e8d4e1785495d5bd3e86dcd5d..f71d193175676e6bef1f765d34014c50db25b8e9 100644 (file)
--- a/drivers/message/Makefile
+++ b/drivers/message/Makefile
@@ -7,11 +7,13 @@ O_TARGET := message.o
 mod-subdirs := i2o fusion 
 
 subdir-$(CONFIG_I2O)           += i2o
-ifeq($(CONFIG_I2O),y)
+ifeq ($(CONFIG_I2O),y)
   obj-y += i2o/i2o.o
 endif
 
 subdir-$(CONFIG_FUSION)                += fusion
-ifeq($(CONFIG_FUSION),y)
+ifeq ($(CONFIG_FUSION),y)
   obj-y += fusion/fusion.o
 endif
+
+include $(TOPDIR)/Rules.make

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index d8acd32dbefd7d7d06ad2dd77d28260a853a52d9..804b323235d21679a1fa86d00918254bb5ad9247 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -21,7 +21,7 @@ yenta_socket-objs                             := pci_socket.o yenta.o
 
 pcmcia_core-objs-y                             := cistpl.o rsrc_mgr.o bulkmem.o cs.o
 pcmcia_core-objs-$(CONFIG_CARDBUS)             += cardbus.o
-pcmcia_core-objs                               := $(pcmcia_core-y)
+pcmcia_core-objs                               := $(pcmcia_core-objs-y)
 
 sa1100_cs-objs-y                               := sa1100_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_ADSBITSY)       += sa1100_adsbitsy.o sa1111_generic.o

diff --git a/fs/jffs/Makefile b/fs/jffs/Makefile
index 878887381d8c762f5a2692b740497418f39e0db1..4ad5e8f5e400c405bcc37e5d4ac8205bf6b02693 100644 (file)
--- a/fs/jffs/Makefile
+++ b/fs/jffs/Makefile
@@ -4,21 +4,20 @@
 # $Id: Makefile,v 1.11 2001/09/25 20:59:41 dwmw2 Exp $
 #
 
-jffs-objs := jffs_fm.o intrep.o
+obj-y := jffs_fm.o intrep.o
 
 ifeq ($(PATCHLEVEL),2)
-       jffs-objs += inode-v22.o
+       obj-y += inode-v22.o
 else
-       jffs-objs += inode-v23.o
+       obj-y += inode-v23.o
 endif
 
 ifeq ($(CONFIG_JFFS_PROC_FS),y)
-       jffs-objs += jffs_proc.o
+       obj-y += jffs_proc.o
 endif
 
 O_TARGET := jffs.o
 
-obj-y := $(jffs-objs)
 obj-m := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make