mtd/fs/jffs2 Makefile,1.40,1.41 GNUmakefile,1.8,1.9

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv16329

Modified Files:
	Makefile GNUmakefile 
Log Message:
Update to build with Red Hat kernel again now it sets CONFIG_MTD


Index: Makefile
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile	2 Jul 2003 10:44:07 -0000	1.40
+++ Makefile	2 Oct 2003 16:30:46 -0000	1.41
@@ -3,14 +3,18 @@
 #
 # $Id$
 
-ifndef CONFIG_MTD
+ifdef OUT_OF_TREE_BUILD
 include $(mtd)/defconfig
 
 # This must be first in the include path, so it goes in $(CC) rather
 # then $(EXTRA_CFLAGS)
 
 CC += -I$(mtd)/../../include
-EXTRA_CFLAGS := -g -DMTD_OUT_OF_TREE -Werror
+EXTRA_CFLAGS := -g -Werror
+
+ifndef CONFIG_MTD
+EXTRA_CFLAGS += -DMTD_OUT_OF_TREE
+endif
 
 ifdef NONAND
 EXTRA_CFLAGS += -DNONAND

Index: GNUmakefile
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/GNUmakefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GNUmakefile	27 May 2003 09:34:41 -0000	1.8
+++ GNUmakefile	2 Oct 2003 16:30:46 -0000	1.9
@@ -5,6 +5,8 @@
 ifndef VERSION
 
 # Someone just typed 'make'. Invoke the kernel makefiles properly...
+OUT_OF_TREE_BUILD=1
+export OUT_OF_TREE_BUILD
 
 modules:
 	make -C $(LINUXDIR) SUBDIRS=`pwd` mtd=`pwd` modules
@@ -17,6 +19,12 @@
 
 clean:
 	rm -f `find . -name \*.ko` `find . -name \*.o`
+
+veryclean:
+	for a in `find . -type f  -a \! -path \*/CVS/\*` ; do  \
+		grep -q ^/`basename $$a`/ `dirname $$a`/CVS/Entries ||  \
+			rm -v $$a ; \
+	done
 
 else