Change Makefiles to support new way to structure yaffs_strxxx renaming for yaffs...

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

diff --git a/direct/basic-test/Makefile b/direct/basic-test/Makefile
index 1761ac449d248deae0c08074347db3914594d236..9ceaecb5597eca6ba3502bae826288d13815909b 100644 (file)
--- a/direct/basic-test/Makefile
+++ b/direct/basic-test/Makefile
@@ -51,7 +51,9 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \
 #               yaffs_checkptrwtest.o\
 
 
-YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
+YAFFSDIRECTSYMLINKS = \
+          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 \
@@ -62,18 +64,14 @@ YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscomp
           yaffs_yaffs2.c yaffs_yaffs2.h \
           yaffs_bitmap.c yaffs_bitmap.h \
           yaffs_verify.c yaffs_verify.h \
-          yaffs_summary.c yaffs_summary.h
+          yaffs_summary.c yaffs_summary.h \
+         yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
+          yaffsfs.h yaffs_osglue.h ydirectenv.h \
+          yaffs_flashif.c yaffscfg.h yaffs_list.h \
+          yaffs_qsort.c yportenv.h yaffs_attribs.c \
+          yaffs_nandif.c yaffs_nandif.h yaffs_nandemul2k.h \
+          yaffs_hweight.h yaffs_hweight.c \
 
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-                      yaffsfs.h yaffs_osglue.h ydirectenv.h \
-                      yaffs_flashif.c yaffscfg.h yaffs_list.h \
-                      yaffs_qsort.c yportenv.h yaffs_attribs.c \
-                      yaffs_nandif.c yaffs_nandif.h yaffs_nandemul2k.h \
-                      yaffs_hweight.h yaffs_hweight.c \
-
-
-
-COPIED_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS)
 
 
 DIRECTTESTOBJS = $(COMMONTESTOBJS) dtest.o
@@ -90,32 +88,20 @@ $(ALLOBJS): %.o: %.c
        gcc -c $(CFLAGS) -o $@ $<
 
 
-$(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" >$@
-                                                        
-$(YAFFSSYMLINKS):
-       ln -s ../../$@ $@
-
 $(YAFFSDIRECTSYMLINKS):
        ln -s ../$@ $@
 
 
-directtest2k: $(COPIED_SOURCES) $(DIRECTTESTOBJS)
+directtest2k: $(YAFFSDIRECTSYMLINKS) $(DIRECTTESTOBJS)
        gcc -o $@ $(DIRECTTESTOBJS)
 
-yaffs_test: $(COPIED_SOURCES) $(YAFFSTESTOBJS)
+yaffs_test: $(YAFFSDIRECTSYMLINKS) $(YAFFSTESTOBJS)
        gcc -o $@ $(YAFFSTESTOBJS)
 
 
-boottest: $(COPIED_SOURCES) $(BOOTTESTOBJS)
+boottest: $(YAFFSDIRECTSYMLINKS) $(BOOTTESTOBJS)
        gcc -o $@ $(BOOTTESTOBJS)
 
 
 clean:
-       rm -f $(TARGETS) $(ALLOBJS) core core $(COPIED_SOURCES)
+       rm -f $(TARGETS) $(ALLOBJS) core $(YAFFSDIRECTSYMLINKS)

diff --git a/direct/python/Makefile b/direct/python/Makefile
index c428732b495028acf1f6d1bc44be0c85e3e9601b..fce3cd0e2dfdee294680e182f58d23225c0e8df1 100644 (file)
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -50,7 +50,16 @@ YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
 
 
 
-YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
+          
+
+YAFFSDIRECTSYMLINKS =   \
+          yaffsfs.c yaffsfs.h yaffscfg.h yaffs_osglue.h  ydirectenv.h \
+          yaffs_flashif.c yaffs_flashif.h yaffs_flashif2.h yaffs_list.h \
+          yaffs_nandif.c yaffs_nandif.h yaffs_qsort.c yaffs_nandemul2k.h \
+          yportenv.h yaffs_attribs.c \
+          yaffs_hweight.c yaffs_hweight.h \
+          yaffs_error.c \
+          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 \
@@ -62,14 +71,6 @@ YAFFS_SOURCES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscomp
           yaffs_yaffs2.c yaffs_yaffs2.h \
           yaffs_bitmap.c yaffs_bitmap.h \
           yaffs_verify.c yaffs_verify.h
-          
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffsfs.h yaffscfg.h yaffs_osglue.h  ydirectenv.h \
-                      yaffs_flashif.c yaffs_flashif.h yaffs_flashif2.h yaffs_list.h \
-                      yaffs_nandif.c yaffs_nandif.h yaffs_qsort.c yaffs_nandemul2k.h \
-                      yportenv.h yaffs_attribs.c \
-                      yaffs_hweight.c yaffs_hweight.h \
-                      yaffs_error.c
 
 DIRECTEXTRASYMLINKS =   yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                         yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \
@@ -77,7 +78,7 @@ DIRECTEXTRASYMLINKS =   yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                         yaffsnewcfg.c yramsim.c yramsim.h \
                         ynorsim.h ynorsim.c yaffs_osglue.c
                                                                         
-ALL_SOURCES = $(YAFFS_SOURCES) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
+COPIED_SOURCES = $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all:  libyaffsfs.so
 
@@ -85,15 +86,6 @@ all:  libyaffsfs.so
 $(YAFFSLIBOBJS): %.o: %.c
        gcc -c $(CFLAGS)   -o $@ $<
 
-$(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 ../$@ $@
@@ -102,13 +94,11 @@ $(DIRECTEXTRASYMLINKS):
        ln -s ../basic-test/$@ $@
 
 
-libyaffsfs.so: $(ALL_SOURCES) $(YAFFSLIBOBJS)
+libyaffsfs.so: $(COPIED_SOURCES) $(YAFFSLIBOBJS)
        gcc -shared $(YAFFSLIBOBJS) -o $@
 
 
-
-
 clean:
-       rm -f  $(YAFFSLIBOBJS)  core $(ALL_SOURCES)
+       rm -f  $(YAFFSLIBOBJS)  core $(COPIED_SOURCES)
        rm -f libyaffsfs.so
        rm -f *.pyc

diff --git a/direct/tests/Makefile b/direct/tests/Makefile
index 495473b58b8a37c72bc24072752fc17f32818644..f7f628c533786e42262c0492d8bf26913d397661 100644 (file)
--- a/direct/tests/Makefile
+++ b/direct/tests/Makefile
@@ -51,8 +51,18 @@ YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_test.o
 
 ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-YAFFSSOURCEFILES = 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  \
+YAFFSDIRECTSYMLINKS =  \
+          yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
+          yaffsfs.h yaffs_osglue.h ydirectenv.h \
+          yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
+          yaffs_nandemul2k.h yaffs_list.h \
+          yaffs_attribs.c \
+          yaffs_nandif.c yaffs_nandif.h yportenv.h \
+          yaffs_hweight.c yaffs_hweight.h \
+          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 \
           yaffs_nameval.c yaffs_nameval.h \
@@ -64,22 +74,13 @@ YAFFSSOURCEFILES = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagsc
           yaffs_verify.c yaffs_verify.h \
           yaffs_summary.c yaffs_summary.h
 
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-                      yaffsfs.h yaffs_osglue.h ydirectenv.h \
-                      yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-                      yaffs_nandemul2k.h yaffs_list.h \
-                      yaffs_attribs.c \
-                      yaffs_nandif.c yaffs_nandif.h yportenv.h \
-                      yaffs_hweight.c yaffs_hweight.h
-
 
 DIRECTEXTRASYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
                        yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \
                        yaffs_ramdisk.c yaffs_ramdisk.h yaffs_ramem2k.c \
                        ynorsim.h ynorsim.c yaffs_osglue.c
 
-COPIED_SOURCES = $(YAFFSSOURCEFILES) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
-#all: directtest2k boottest
+COPIED_SOURCES = $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all: yaffs_test fuzzer
 
@@ -87,15 +88,6 @@ $(ALLOBJS): %.o: %.c
        gcc -c $(CFLAGS) -o $@ $<
 
 
-$(YAFFSSOURCEFILES):
-       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 ../$@ $@
 
@@ -109,9 +101,5 @@ yaffs_test: $(COPIED_SOURCES) $(YAFFSTESTOBJS)
 fuzzer: fuzzer.c
        gcc $(CFLAGS) -o $@ $<
 
-
-
-
-
 clean:
        rm -f yaffs_test fuzzer fuzzer.o $(ALLOBJS) core $(COPIED_SOURCES)