Compilation clean up

[yaffs2.git] / utils / Makefile

diff --git a/utils/Makefile b/utils/Makefile
index 5c1ee41ed498396529ca2bf2479a7fbeb755c0bb..710ebbf3186b1f7ab40520cd6f223679fe125ad0 100644 (file)
--- 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
@@ -16,7 +16,7 @@
 
 #KERNELDIR = /usr/src/kernel-headers-2.4.18
 
-CFLAGS =   -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
+CFLAGS =    -O2 -Wall -DCONFIG_YAFFS_UTIL
 CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
 CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
@@ -25,22 +25,43 @@ MAKETOOLS =
 
 CC=$(MAKETOOLS)gcc
 
-MKYAFFS2SOURCES = mkyaffs2image.c
-MKYAFFS2LINKS = yaffs_ecc.c yaffs_packedtags2.c yaffs_tagsvalidity.c
+COMMON_BASE_C_LINKS = yaffs_ecc.c
+COMMON_BASE_LINKS = $(COMMON_BASE_C_LINKS) yaffs_ecc.h yaffs_guts.h yaffs_packedtags2.h yaffs_trace.h
+COMMON_DIRECT_C_LINKS = yaffs_hweight.c
+COMMON_C_LINKS = $(COMMON_DIRECT_C_LINKS) $(COMMON_BASE_C_LINKS)
+COMMON_DIRECT_LINKS= $(COMMON_DIRECT_C_LINKS) yportenv.h yaffs_hweight.h yaffs_list.h
+COMMONOBJS = $(COMMON_C_LINKS:.c=.o)
+
+MKYAFFSSOURCES = mkyaffsimage.c
+MKYAFFSIMAGEOBJS = $(MKYAFFSSOURCES:.c=.o)
 
+MKYAFFS2SOURCES = mkyaffs2image.c
+MKYAFFS2LINKS = yaffs_packedtags2.c
 MKYAFFS2IMAGEOBJS = $(MKYAFFS2SOURCES:.c=.o) $(MKYAFFS2LINKS:.c=.o)
 
-all: mkyaffs2image
+BASE_LINKS = $(MKYAFFSLINKS) $(MKYAFFS2LINKS) $(COMMON_BASE_LINKS)
+DIRECT_LINKS = $(MKYAFFS_DIRECT_LINKS) $(MKYAFFS2_DIRECT_LINKS) $(COMMON_DIRECT_LINKS)
+ALL_LINKS = $(BASE_LINKS) $(DIRECT_LINKS)
 
-$(MKYAFFS2IMAGEOBJS): %.o: %.c
+all: mkyaffsimage mkyaffs2image
+
+$(BASE_LINKS):
+       ln -s ../$@ $@
+
+$(DIRECT_LINKS):
+       ln -s ../direct/$@ $@
+
+$(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : $(ALL_LINKS)
+
+$(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c
        $(CC) -c $(CFLAGS) $< -o $@
 
-mkyaffs2image: $(MKYAFFS2IMAGEOBJS)
-       $(CC) -o $@ $(MKYAFFS2IMAGEOBJS)
+mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS)
+       $(CC) -o $@  $^
 
-$(MKYAFFS2LINKS):
-       ln -s ../$@ $@
+mkyaffs2image: $(MKYAFFS2IMAGEOBJS) $(COMMONOBJS)
+       $(CC) -o $@ $^
 
 
 clean:
-       rm -f $(MKYAFFS2IMAGEOBJS) core
+       rm -f $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) $(ALL_LINKS) mkyaffsimage mkyaffs2image core