mtd/drivers/mtd/devices Makefile.common,NONE,1.1 GNUmakefile,1.5,1.6 Makefile,1.7,1.8

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/devices
In directory phoenix.infradead.org:/tmp/cvs-serv26380/devices

Modified Files:
	GNUmakefile Makefile 
Added Files:
	Makefile.common 
Log Message:
Make makefiles work for 2.5 too


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile.common'
Index: GNUmakefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/GNUmakefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GNUmakefile	16 May 2003 16:02:57 -0000	1.5
+++ GNUmakefile	21 May 2003 15:00:02 -0000	1.6
@@ -1,32 +1,7 @@
+#
+# Out of tree drivers/mtd/devices/GNUmakefile
+#
 # $Id$
 
-ifndef CONFIG_MTD
-
-# We're being invoked outside a normal kernel build. Fake it
-
-CONFIG_MTD_DOC1000 := m
-CONFIG_MTD_DOC2000 := m
-CONFIG_MTD_DOC2001 := m
-CONFIG_MTD_DOCPROBE := m
-CONFIG_MTD_SLRAM := m
-CONFIG_MTD_PMC551 := $(CONFIG_PCI)
-CONFIG_MTD_MTDRAM := m
-
-CFLAGS_mtdram.o := -DCONFIG_MTDRAM_TOTAL_SIZE=4096 -DCONFIG_MTDRAM_ERASE_SIZE=128
-
-endif
-
-# Normal case - build in-kernel
-
-ifeq ($(VERSION),2)
- ifneq ($(PATCHLEVEL),4)
-  ifneq ($(PATCHLEVEL),5)
-   OLDTOPDIR := $(TOPDIR)
-   TOPDIR := $(shell pwd)/..
-  endif
- endif
-endif
-
+obj := $(shell pwd)
 include Makefile
-
-

Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	20 May 2003 13:10:04 -0000	1.7
+++ Makefile	21 May 2003 15:00:02 -0000	1.8
@@ -1,30 +1,15 @@
 #
-# linux/drivers/devices/Makefile
+# Out of tree drivers/mtd/devices/Makefile
 #
 # $Id$
 
-BELOW25		:= $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
+# We know, but not quite yet...
+CFLAGS_doc2000.o := -Wno-error
+CFLAGS_doc2001.o := -Wno-error
 
-ifeq ($(BELOW25),y)
-O_TARGET	:= devlink.o
-endif
+# This wants replacing with a map driver and nobody still has one anyway
+CFLAGS_doc1000.o := -Wno-error
 
-#                       *** BIG UGLY NOTE ***
-#
-# The removal of get_module_symbol() and replacement with
-# inter_module_register() et al has introduced a link order dependency
-# here where previously there was none.  We now have to ensure that
-# doc200[01].o are linked before docprobe.o
-
-obj-$(CONFIG_MTD_DOC1000)	+= doc1000.o
-obj-$(CONFIG_MTD_DOC2000)	+= doc2000.o
-obj-$(CONFIG_MTD_DOC2001)	+= doc2001.o
-obj-$(CONFIG_MTD_DOCPROBE)	+= docprobe.o docecc.o
-obj-$(CONFIG_MTD_SLRAM)		+= slram.o
-obj-$(CONFIG_MTD_PMC551)	+= pmc551.o
-obj-$(CONFIG_MTD_MS02NV)	+= ms02-nv.o
-obj-$(CONFIG_MTD_MTDRAM)	+= mtdram.o
-obj-$(CONFIG_MTD_LART)		+= lart.o
-obj-$(CONFIG_MTD_BLKMTD)	+= blkmtd.o
+# Munge the kernel build environment to suit our needs....
+include $(mtd)/Makefile.inc
 
--include $(TOPDIR)/Rules.make