X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=utils%2FMakefile;h=49bf03b1baac34d115bf7b6fb45716ef2e20076b;hp=5c1ee41ed498396529ca2bf2479a7fbeb755c0bb;hb=d223baa0fa5644b48c2626f8d42b05ac45b1daf6;hpb=afa20b9f76da4dfb1a0759ffdbedf61933f7d139

diff --git a/utils/Makefile b/utils/Makefile
index 5c1ee41..49bf03b 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,7 +1,7 @@
 #Makefile for mkyaffs
 #
 # NB this is not yet suitable for putting into the kernel tree.
-# YAFFS: Yet another FFS. A NAND-flash specific file system. 
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system. 
 #
 # Copyright (C) 2002 Aleph One Ltd.
 #   for Toby Churchill Ltd and Brightstar Engineering
@@ -25,22 +25,30 @@ MAKETOOLS =
 
 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)
 
-all: mkyaffs2image
+all: mkyaffsimage mkyaffs2image
 
-$(MKYAFFS2IMAGEOBJS): %.o: %.c
+$(COMMONLINKS) $(MKYAFFSLINKS) $(MKYAFFS2LINKS):
+	ln -s ../$@ $@
+
+$(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
 	$(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:
-	rm -f $(MKYAFFS2IMAGEOBJS) core
+	rm -f $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) $(COMMONLINKS) $(MKYAFFSLINKS) $(MKYAFFS2LINKS) mkyaffsimage mkyaffs2image core