diff options
-rw-r--r-- | rbutil/mkamsboot/Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/rbutil/mkamsboot/Makefile b/rbutil/mkamsboot/Makefile index cb8b2b8207..3b9acf4242 100644 --- a/rbutil/mkamsboot/Makefile +++ b/rbutil/mkamsboot/Makefile | |||
@@ -1,6 +1,5 @@ | |||
1 | # We use the UCL code available in the Rockbox tools/ directory | 1 | # We use the UCL code available in the Rockbox tools/ directory |
2 | CFLAGS=-I../../tools/ucl/include -Wall | 2 | CFLAGS=-I../../tools/ucl/include -Wall |
3 | LIBUCL=../../tools/ucl/src/libucl$(RBARCH).a | ||
4 | CC = gcc | 3 | CC = gcc |
5 | 4 | ||
6 | #change for releases | 5 | #change for releases |
@@ -27,7 +26,6 @@ endif | |||
27 | endif | 26 | endif |
28 | endif | 27 | endif |
29 | 28 | ||
30 | |||
31 | ifdef RBARCH | 29 | ifdef RBARCH |
32 | CFLAGS += -arch $(RBARCH) | 30 | CFLAGS += -arch $(RBARCH) |
33 | endif | 31 | endif |
@@ -36,33 +34,38 @@ OUT = $(TARGET_DIR)build$(RBARCH) | |||
36 | 34 | ||
37 | all: $(OUTPUT) | 35 | all: $(OUTPUT) |
38 | 36 | ||
37 | # Dependant modules | ||
38 | LIBUCL=../../tools/ucl/src/libucl$(RBARCH).a | ||
39 | |||
39 | $(LIBUCL): | 40 | $(LIBUCL): |
40 | make -C ../../tools/ucl/src $(TARGET_DIR)libucl$(RBARCH).a | 41 | make -C ../../tools/ucl/src $(TARGET_DIR)libucl$(RBARCH).a |
41 | 42 | ||
42 | # This file can be generated in the dualboot/ directory | 43 | # This file can be generated in the dualboot/ directory |
43 | $(OUT)/dualboot.o: dualboot.c | 44 | $(OUT)/dualboot.o: dualboot.[ch] |
44 | @echo CC $< | 45 | @echo CC $< |
45 | $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/dualboot.o dualboot.c | 46 | $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/dualboot.o dualboot.c |
46 | 47 | ||
47 | $(OUT)/md5.o: md5.c md5.h | 48 | $(OUT)/md5.o: md5.[ch] |
48 | @echo CC $< | 49 | @echo CC $< |
49 | $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/md5.o -W -Wall md5.c | 50 | $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/md5.o -W -Wall md5.c |
50 | 51 | ||
51 | $(OUT)/mkamsboot.o: mkamsboot.c dualboot.h md5.h | 52 | DEPENDANT_OBJS=$(LIBUCL) $(OUT)/dualboot.o $(OUT)/md5.o |
53 | |||
54 | $(OUT)/mkamsboot.o: mkamsboot.[ch] $(DEPENDANT_OBJS) | ||
52 | @echo CC $< | 55 | @echo CC $< |
53 | $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/mkamsboot.o -W -Wall mkamsboot.c -DVERSION=\"$(APPVERSION)\" | 56 | $(SILENT)$(CC) $(CFLAGS) -c -o $(OUT)/mkamsboot.o -W -Wall mkamsboot.c -DVERSION=\"$(APPVERSION)\" |
54 | 57 | ||
55 | $(OUTPUT): $(OUT) $(OUT)/mkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o $(LIBUCL) | 58 | $(OUTPUT): $(OUT) $(OUT)/mkamsboot.o |
56 | @echo CC $< | 59 | @echo CC $< |
57 | $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OUT)/mkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o $(LIBUCL) | 60 | $(SILENT)$(CC) $(CFLAGS) -o $(OUTPUT) $(OUT)/mkamsboot.o $(DEPENDANT_OBJS) |
58 | 61 | ||
59 | $(OUT)/libmkamsboot.o: mkamsboot.c dualboot.h md5.h | 62 | $(OUT)/libmkamsboot.o: $(OUT)/mkamsboot.o |
60 | @echo CC $< | 63 | @echo CC $< |
61 | $(SILENT)$(CC) $(CFLAGS) -DLIB -c -o $(OUT)/libmkamsboot.o -W -Wall mkamsboot.c | 64 | $(SILENT)$(CC) $(CFLAGS) -DLIB -c -o $(OUT)/libmkamsboot.o -W -Wall mkamsboot.c |
62 | 65 | ||
63 | libmkamsboot$(RBARCH).a: $(OUT) $(OUT)/libmkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o | 66 | libmkamsboot$(RBARCH).a: $(OUT) $(OUT)/libmkamsboot.o |
64 | @echo AR $@ | 67 | @echo AR $@ |
65 | $(SILENT)$(AR) ruc $(TARGET_DIR)libmkamsboot$(RBARCH).a $(OUT)/libmkamsboot.o $(OUT)/md5.o $(OUT)/dualboot.o | 68 | $(SILENT)$(AR) ruc $(TARGET_DIR)libmkamsboot$(RBARCH).a $(OUT)/libmkamsboot.o |
66 | 69 | ||
67 | # some trickery to build ppc and i386 from a single call | 70 | # some trickery to build ppc and i386 from a single call |
68 | ifeq ($(RBARCH),) | 71 | ifeq ($(RBARCH),) |
@@ -79,7 +82,7 @@ libmkamsboot-universal: libmkamsbooti386.a libmkamsbootppc.a | |||
79 | lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a | 82 | lipo -create $(TARGET_DIR)libmkamsbootppc.a $(TARGET_DIR)libmkamsbooti386.a -output $(TARGET_DIR)libmkamsboot.a |
80 | 83 | ||
81 | clean: | 84 | clean: |
82 | rm -f $(OUTPUT) libmkamsboot.o $(TARGET_DIR)libmkamsboot*.a mkamsboot.dmg | 85 | rm -f $(OUTPUT) libmkamsboot.o $(TARGET_DIR)libmkamsboot*.a mkamsboot.dmg $(DEPENDANT_OBJS) |
83 | rm -rf build* mkamsboot-* | 86 | rm -rf build* mkamsboot-* |
84 | 87 | ||
85 | mkamsboot-i386: | 88 | mkamsboot-i386: |