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

[yaffs2.git] / direct / python / Makefile

diff --git a/direct/python/Makefile b/direct/python/Makefile
index 38f8b11420bcd1f957661bfae02811e03f436ad2..fce3cd0e2dfdee294680e182f58d23225c0e8df1 100644 (file)
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -29,28 +29,41 @@ CFLAGS +=    -O0 -fPIC
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
 
-COMMONTESTOBJS = yaffscfg2k.o yramsim.o yaffs_fileem2k.o\
+COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\
+                yramsim.o yaffs_fileem2k.o\
                 yaffs_nandif.o yaffs_attribs.o \
                 yaffsfs.o  yaffs_ecc.o yaffs_guts.o \
                 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
-                yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \
+                yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \
                 yaffs_checkptrw.o  yaffs_qsort.o\
                 yaffs_nameval.o \
+                yaffs_summary.o \
                 yaffs_allocator.o \
                 yaffs_norif1.o  ynorsim.o \
                 yaffs_bitmap.o \
                 yaffs_verify.o \
-                yaffs_yaffs1.o yaffs_yaffs2.o 
+                yaffs_yaffs1.o yaffs_yaffs2.o \
+                yaffs_error.o
 
 
-YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o yaffs_error_converter.o
+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 \
+          
+
+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_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
+          yaffs_checkptrw.h yaffs_checkptrw.c \
+          yaffs_summary.c yaffs_summary.h \
           yaffs_nameval.c yaffs_nameval.h yaffs_attribs.h \
           yaffs_trace.h \
           yaffs_allocator.c yaffs_allocator.h \
@@ -58,20 +71,14 @@ YAFFSSYMLINKS = 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_malloc.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
 
 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 \
                         yaffsnewcfg.c yramsim.c yramsim.h \
-                        ynorsim.h ynorsim.c
+                        ynorsim.h ynorsim.c yaffs_osglue.c
                                                                         
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
+COPIED_SOURCES = $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
 
 all:  libyaffsfs.so
 
@@ -80,9 +87,6 @@ $(YAFFSLIBOBJS): %.o: %.c
        gcc -c $(CFLAGS)   -o $@ $<
 
 
-$(YAFFSSYMLINKS):
-       ln -s ../../$@ $@
-
 $(YAFFSDIRECTSYMLINKS):
        ln -s ../$@ $@
 
@@ -90,13 +94,11 @@ $(DIRECTEXTRASYMLINKS):
        ln -s ../basic-test/$@ $@
 
 
-libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
+libyaffsfs.so: $(COPIED_SOURCES) $(YAFFSLIBOBJS)
        gcc -shared $(YAFFSLIBOBJS) -o $@
 
 
-
-
 clean:
-       rm -f  $(YAFFSLIBOBJS)  core $(SYMLINKS)
+       rm -f  $(YAFFSLIBOBJS)  core $(COPIED_SOURCES)
        rm -f libyaffsfs.so
        rm -f *.pyc