summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-30 21:04:07 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-30 21:04:07 +0000
commit8ed7a590ad563cd09edc63bf8bbc7323ed9ed821 (patch)
tree20743920d6f4436de7251a2d7d2d7d61dc50f25e
parentaae798d237c6cd614a405d8d1d649bd97556c0a5 (diff)
downloadrockbox-8ed7a590ad563cd09edc63bf8bbc7323ed9ed821.tar.gz
rockbox-8ed7a590ad563cd09edc63bf8bbc7323ed9ed821.zip
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
-rw-r--r--rbutil/mktccboot/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/rbutil/mktccboot/Makefile b/rbutil/mktccboot/Makefile
index 3f23e044d6..cd8a539648 100644
--- a/rbutil/mktccboot/Makefile
+++ b/rbutil/mktccboot/Makefile
@@ -45,16 +45,17 @@ OUT = $(TARGET_DIR)build$(RBARCH)
45 45
46all: $(OUTPUT) 46all: $(OUTPUT)
47 47
48$(TOOLSDIR)/telechips.o: $(TOOLSDIR)/telechips.[ch] 48$(OUT)/telechips.o: $(TOOLSDIR)/telechips.[ch]
49 make -C $(TOOLSDIR) $(TARGET_DIR)telechips.o 49 @echo CC $<
50 $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/telechips.o $(TOOLSDIR)/telechips.c
50 51
51$(OUT)/mktccboot.o: mktccboot.[ch] $(TOOLSDIR)/telechips.o 52$(OUT)/mktccboot.o: mktccboot.[ch] $(OUT)/telechips.o
52 @echo CC $< 53 @echo CC $<
53 $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/mktccboot.o -W -Wall mktccboot.c -DVERSION=\"$(APPVERSION)\" 54 $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/mktccboot.o -W -Wall mktccboot.c -DVERSION=\"$(APPVERSION)\"
54 55
55$(OUTPUT): $(OUT) $(OUT)/mktccboot.o 56$(OUTPUT): $(OUT) $(OUT)/mktccboot.o
56 @echo CC $< 57 @echo LD $@
57 $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OUT)/mktccboot.o $(TOOLSDIR)/telechips.o 58 $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OUT)/mktccboot.o $(OUT)/telechips.o
58 59
59$(OUT)/libmktccboot.o: $(OUT)/mktccboot.o 60$(OUT)/libmktccboot.o: $(OUT)/mktccboot.o
60 @echo CC $< 61 @echo CC $<