mtd/drivers/mtd/chips Makefile.common,NONE,1.1 GNUmakefile,1.7,1.8 Makefile,1.11,1.12

[David Woodhouse]

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

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/chips/GNUmakefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GNUmakefile	13 Sep 2002 15:16:10 -0000	1.7
+++ GNUmakefile	21 May 2003 15:00:01 -0000	1.8
@@ -1,38 +1,7 @@
+#
+# Out of tree drivers/mtd/chips/GNUmakefile
+#
 # $Id$
 
-ifndef CONFIG_MTD
-
-# We're being invoked outside a normal kernel build. Fake it
-
-CONFIG_MTD := m
-
-CONFIG_MTD_CFI := m
-CONFIG_MTD_CFI_AMDSTD := m
-CONFIG_MTD_CFI_INTELEXT := m
-CONFIG_MTD_GEN_PROBE := m
-CONFIG_MTD_JEDECPROBE := m
-CONFIG_MTD_INTELPROBE := m
-CONFIG_MTD_RAM := m
-CONFIG_MTD_ROM := m
-CONFIG_MTD_ABSENT := m
-# Deprecated:
-#CONFIG_MTD_JEDEC := m
-#CONFIG_MTD_SHARP := m
-#CONFIG_MTD_AMDSTD := m
-
-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/chips/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	20 May 2003 13:10:04 -0000	1.11
+++ Makefile	21 May 2003 15:00:01 -0000	1.12
@@ -1,35 +1,8 @@
 #
-# linux/drivers/chips/Makefile
+# Out of tree drivers/mtd/chips/Makefile
 #
 # $Id$
 
-BELOW25		:= $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
+# Munge the kernel build environment to suit our needs....
+include $(mtd)/Makefile.inc
 
-ifeq ($(BELOW25),y)
-O_TARGET	:= chipslink.o
-endif
-
-export-objs	:= chipreg.o gen_probe.o
-
-#                       *** 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
-# the CFI command set drivers are linked before cfi_probe.o
-
-obj-$(CONFIG_MTD)		+= chipreg.o
-obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o 
-obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o
-obj-$(CONFIG_MTD_CFI_STAA)	+= cfi_cmdset_0020.o
-obj-$(CONFIG_MTD_CFI_AMDSTD)	+= cfi_cmdset_0002.o
-obj-$(CONFIG_MTD_CFI_INTELEXT)	+= cfi_cmdset_0001.o
-obj-$(CONFIG_MTD_GEN_PROBE)	+= gen_probe.o
-obj-$(CONFIG_MTD_JEDEC)		+= jedec.o
-obj-$(CONFIG_MTD_JEDECPROBE)	+= jedec_probe.o
-obj-$(CONFIG_MTD_RAM)		+= map_ram.o
-obj-$(CONFIG_MTD_ROM)		+= map_rom.o
-obj-$(CONFIG_MTD_SHARP)		+= sharp.o
-obj-$(CONFIG_MTD_ABSENT)	+= map_absent.o
-
--include $(TOPDIR)/Rules.make