From 14facbc63065c35a3a860664876a64f6a20a7f5e Mon Sep 17 00:00:00 2001 From: bluebrother Date: Fri, 30 Oct 2009 21:04:07 +0000 Subject: [PATCH] Fix mktccboot to make Rockbox Utility compile again. - when building out-of-tree don't build objects in the tools folder. - take out-of-tree building into account when looking for objects. - don't lie to the user -- linking is not compiling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23423 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/mktccboot/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile index 3f23e044d..cd8a53964 100644 --- a/rbutil/mktccboot/Makefile +++ b/rbutil/mktccboot/Makefile @@ -45,16 +45,17 @@ OUT = $(TARGET_DIR)build$(RBARCH) all: $(OUTPUT) -$(TOOLSDIR)/telechips.o: $(TOOLSDIR)/telechips.[ch] - make -C $(TOOLSDIR) $(TARGET_DIR)telechips.o +$(OUT)/telechips.o: $(TOOLSDIR)/telechips.[ch] + @echo CC $< + $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/telechips.o $(TOOLSDIR)/telechips.c -$(OUT)/mktccboot.o: mktccboot.[ch] $(TOOLSDIR)/telechips.o +$(OUT)/mktccboot.o: mktccboot.[ch] $(OUT)/telechips.o @echo CC $< $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/mktccboot.o -W -Wall mktccboot.c -DVERSION=\"$(APPVERSION)\" $(OUTPUT): $(OUT) $(OUT)/mktccboot.o - @echo CC $< - $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OUT)/mktccboot.o $(TOOLSDIR)/telechips.o + @echo LD $@ + $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OUT)/mktccboot.o $(OUT)/telechips.o $(OUT)/libmktccboot.o: $(OUT)/mktccboot.o @echo CC $< -- 2.11.4.GIT