RE: autoconf for mtd-utils

["David Byron" <dbyron@hheld.com>]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

On Wed, 2006-07-19 at 12:25p, David Woodhouse wrote: 

> If you just send a proper Makefile patch which provides
> separate source and build directories, that'd be useful
> though.

Like this?

-DB

[-- Attachment #2: Makefile.patch --]
[-- Type: application/octet-stream, Size: 2420 bytes --]

diff --git a/Makefile b/Makefile
index 37cd7f7..62c7650 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,18 @@ # $Id: Makefile,v 1.60 2005/11/07 11:15:
 SBINDIR=/usr/sbin
 MANDIR=/usr/man
 INCLUDEDIR=/usr/include
-#CROSS=arm-linux-
-CC := $(CROSS)gcc
+#CROSS=arm-linux
+CC := $(CROSS)-gcc
 CFLAGS := -I./include -O2 -Wall
 
-TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+ifeq ($(origin CROSS),undefined)
+  BUILDDIR = .
+else
+  BUILDDIR = $(CROSS)
+  CLEAN_BUILDDIR = $(BUILDDIR)
+endif
+
+RAWTARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
 	mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \
 	flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite \
 	jffs2dump \
@@ -18,40 +25,48 @@ TARGETS = ftl_format flash_erase flash_e
 	rfddump rfdformat \
 	sumtool #jffs2reader
 
+TARGETS = $(foreach target,$(RAWTARGETS),$(BUILDDIR)/$(target))
+
 SYMLINKS =
 
 %: %.o
-	$(CC) $(LDFLAGS) -g -o $@ $^
+	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $@ $^
 
-%.o: %.c
-	$(CC) $(CFLAGS) -g -c -o $@ $< -g -Wp,-MD,.$<.dep
+$(BUILDDIR)/%.o: %.c
+	mkdir -p $(BUILDDIR)
+	$(CC) $(CFLAGS) -g -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep
 
 .SUFFIXES:
 
 all: $(TARGETS)
 
-IGNORE=${wildcard .*.c.dep}
+IGNORE=${wildcard $(BUILDDIR)/.*.c.dep}
 -include ${IGNORE}
 
 clean:
-	rm -f *.o $(TARGETS) .*.c.dep $(SYMLINKS)
+	rm -f $(BUILDDIR)/*.o $(TARGETS) $(BUILDDIR)/.*.c.dep $(SYMLINKS)
+	if [ "$(CROSS)x" != "x" ]; then rm -rf $(CROSS); fi
 
 $(SYMLINKS):
 	ln -sf ../fs/jffs2/$@ $@
 
-mkfs.jffs2: crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr.o
+$(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc32.o \
+			$(BUILDDIR)/compr_rtime.o \
+			$(BUILDDIR)/mkfs.jffs2.o \
+			$(BUILDDIR)/compr_zlib.o \
+			$(BUILDDIR)/compr.o
 	$(CC) $(LDFLAGS) -o $@ $^ -lz
 
-flash_eraseall: crc32.o flash_eraseall.o
+$(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-jffs2reader: jffs2reader.o
+$(BUILDDIR)/jffs2reader: $(BUILDDIR)/jffs2reader.o
 	$(CC) $(LDFLAGS) -o $@ $^ -lz
 
-jffs2dump: jffs2dump.o crc32.o
+$(BUILDDIR)/jffs2dump: $(BUILDDIR)/jffs2dump.o $(BUILDDIR)/crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-sumtool: sumtool.o crc32.o
+$(BUILDDIR)/sumtool: $(BUILDDIR)/sumtool.o $(BUILDDIR)/crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
 install: ${TARGETS}