mtd/drivers/mtd/nand Makefile.common,NONE,1.1 GNUmakefile,1.3,1.4 Makefile,1.11,1.12

[David Woodhouse]

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

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/nand/GNUmakefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GNUmakefile	13 Sep 2002 14:38:58 -0000	1.3
+++ GNUmakefile	21 May 2003 15:00:04 -0000	1.4
@@ -1,27 +1,7 @@
+#
+# Out of tree drivers/mtd/nand/GNUmakefile
+#
 # $Id$
 
-ifndef CONFIG_MTD
-
-# We're being invoked outside a normal kernel build. Fake it
-
-CONFIG_MTD_NAND := m
-CONFIG_MTD_NAND_ECC := m
-# CONFIG_MTD_NAND_SPIA := m
-# CONFIG_MTD_NAND_AUTCPU12 := m
-CFLAGS_nand.o := -DCONFIG_MTD_NAND_ECC
-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/nand/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	20 May 2003 13:10:05 -0000	1.11
+++ Makefile	21 May 2003 15:00:04 -0000	1.12
@@ -1,23 +1,6 @@
 #
-# linux/drivers/nand/Makefile
+# Out of tree drivers/mtd/nand/Makefile
 #
 # $Id$
 
-BELOW25		:= $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
-
-ifeq ($(BELOW25),y)
-O_TARGET			:= nandlink.o
-endif
-
-export-objs			:= nand.o nand_ecc.o nand_ids.o
-
-nandobjs-y			:= nand.o
-
-obj-$(CONFIG_MTD_NAND)		+= $(nandobjs-y) 
-obj-$(CONFIG_MTD_NAND)		+= nand_ecc.o
-obj-$(CONFIG_MTD_NAND_SPIA)	+= spia.o
-obj-$(CONFIG_MTD_NAND_AUTCPU12)	+= autcpu12.o
-obj-$(CONFIG_MTD_NAND_EDB7312)  += edb7312.o
-obj-$(CONFIG_MTD_NAND_IDS)	+= nand_ids.o
-
--include $(TOPDIR)/Rules.make
+include $(mtd)/Makefile.inc