Add mkyaffsimage to yaffs2 module, some further "make clean" cleanups.

[yaffs2.git] / utils / Makefile

diff --git a/utils/Makefile b/utils/Makefile
index 5c1ee41ed498396529ca2bf2479a7fbeb755c0bb..cdd41a79a8d15675e109d577baaac82523692f6c 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -25,22 +25,30 @@ MAKETOOLS =
 
 CC=$(MAKETOOLS)gcc
 
 
 CC=$(MAKETOOLS)gcc
 

-MKYAFFS2SOURCES = mkyaffs2image.c
-MKYAFFS2LINKS = yaffs_ecc.c yaffs_packedtags2.c yaffs_tagsvalidity.c
+COMMONLINKS = yaffs_ecc.c
+COMMONOBJS = $(COMMONLINKS:.c=.o)
+
+MKYAFFSSOURCES = mkyaffsimage.c
+MKYAFFSIMAGEOBJS = $(MKYAFFSSOURCES:.c=.o)

 
 

+MKYAFFS2SOURCES = mkyaffs2image.c
+MKYAFFS2LINKS = yaffs_packedtags2.c yaffs_tagsvalidity.c

 MKYAFFS2IMAGEOBJS = $(MKYAFFS2SOURCES:.c=.o) $(MKYAFFS2LINKS:.c=.o)
 
 MKYAFFS2IMAGEOBJS = $(MKYAFFS2SOURCES:.c=.o) $(MKYAFFS2LINKS:.c=.o)
 

-all: mkyaffs2image
+all: mkyaffsimage mkyaffs2image

 
 

-$(MKYAFFS2IMAGEOBJS): %.o: %.c
+$(COMMONLINKS) $(MKYAFFSLINKS) $(MKYAFFS2LINKS):
+       ln -s ../$@ $@
+
+$(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c

        $(CC) -c $(CFLAGS) $< -o $@
 
        $(CC) -c $(CFLAGS) $< -o $@
 

-mkyaffs2image: $(MKYAFFS2IMAGEOBJS)
-       $(CC) -o $@ $(MKYAFFS2IMAGEOBJS)
+mkyaffsimage: $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)
+       $(CC) -o $@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS)

 
 

-$(MKYAFFS2LINKS):
-       ln -s ../$@ $@
+mkyaffs2image: $(COMMONOBJS) $(MKYAFFS2IMAGEOBJS)
+       $(CC) -o $@ $(COMMONOBJS) $(MKYAFFS2IMAGEOBJS)

 
 
 clean:
 
 
 clean:

-       rm -f $(MKYAFFS2IMAGEOBJS) core
+       rm -f $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) $(COMMONLINKS) $(MKYAFFSLINKS) $(MKYAFFS2LINKS) mkyaffsimage mkyaffs2image core