From: Charles Manning <cdhmanning@gmail.com>
Date: Tue, 14 Feb 2012 01:06:28 +0000 (+1300)
Subject: Update Makefiles for new sed-based way case-insensitive handling
X-Git-Tag: pre-driver-refactoring~31
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=6ee253300224f1f146931cf7822f57059f600f4b;hp=2369fadda0bee21c2ddb7a7596be7a5df578757e

Update Makefiles for new sed-based way case-insensitive handling

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---

diff --git a/direct/python/Makefile b/direct/python/Makefile
index e0b10e7..c428732 100644
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -50,7 +50,7 @@ YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
 
 
 
-YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
+YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
           yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h  \
           yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h  \
           yaffs_checkptrw.h yaffs_checkptrw.c \
@@ -77,7 +77,7 @@ DIRECTEXTRASYMLINKS =   yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                         yaffsnewcfg.c yramsim.c yramsim.h \
                         ynorsim.h ynorsim.c yaffs_osglue.c
                                                                         
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
+ALL_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all:  libyaffsfs.so
 
@@ -85,9 +85,15 @@ all:  libyaffsfs.so
 $(YAFFSLIBOBJS): %.o: %.c
 	gcc -c $(CFLAGS)   -o $@ $<
 
-
-$(YAFFSSYMLINKS):
-	ln -s ../../$@ $@
+$(YAFFS_SOURCES):
+	sed ../../$@ \
+	-e "s/strcat/yaffs_strcat/g" \
+	-e "s/strcpy/yaffs_strcpy/g" \
+	-e "s/strncpy/yaffs_strncpy/g" \
+	-e "s/strnlen/yaffs_strnlen/g" \
+	-e "s/strcmp/yaffs_strcmp/g" \
+	-e "s/strncmp/yaffs_strncmp/g" >$@
+							
 
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
@@ -96,13 +102,13 @@ $(DIRECTEXTRASYMLINKS):
 	ln -s ../basic-test/$@ $@
 
 
-libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
+libyaffsfs.so: $(ALL_SOURCES) $(YAFFSLIBOBJS)
 	gcc -shared $(YAFFSLIBOBJS) -o $@
 
 
 
 
 clean:
-	rm -f  $(YAFFSLIBOBJS)  core $(SYMLINKS)
+	rm -f  $(YAFFSLIBOBJS)  core $(ALL_SOURCES)
 	rm -f libyaffsfs.so
 	rm -f *.pyc
diff --git a/direct/wince-common/Makefile b/direct/wince-common/Makefile
index a444882..b473ea6 100644
--- a/direct/wince-common/Makefile
+++ b/direct/wince-common/Makefile
@@ -47,7 +47,7 @@ YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_test.o
 
 ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \
+YAFFS_SOURCES = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \
           yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h  yaffs_nandemul2k.h \
           yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h yaffs_list.h \
           yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
@@ -68,18 +68,20 @@ YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
 
 BASICTESTSYMLINKS = yramsim.c yramsim.h
 
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(BASICTESTSYMLINKS)
+ALL_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS) $(BASICTESTSYMLINKS)
 
 
+symlinks: $(ALL_SOURCES)
 
 
-
-
-symlinks: $(SYMLINKS)
-
-
-$(YAFFSSYMLINKS):
-	ln -s ../../$@ $@
+$(YAFFS_SOURCES):
+	sed ../../$@ \
+	-e "s/strcat/yaffs_strcat/g" \
+	-e "s/strcpy/yaffs_strcpy/g" \
+	-e "s/strncpy/yaffs_strncpy/g" \
+	-e "s/strnlen/yaffs_strnlen/g" \
+	-e "s/strcmp/yaffs_strcmp/g" \
+	-e "s/strncmp/yaffs_strncmp/g" >$@
 
 $(YAFFSDIRECTSYMLINKS):
 	ln -s ../$@ $@
@@ -89,4 +91,4 @@ $(BASICTESTSYMLINKS):
 
 
 clean:
-	rm -f $(SYMLINKS)
+	rm -f $(ALL_SOURCES)