diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2010-01-17 13:03:10 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2010-01-17 13:03:10 +0000 |
commit | e3fc65cfff31bf71dc648280ad714d214b9666a1 (patch) | |
tree | 907411354b086b164a55539f7dd014faa9c2552e | |
parent | 809e69c769a4d95f36701dad436cb89f02af3002 (diff) | |
download | rockbox-e3fc65cfff31bf71dc648280ad714d214b9666a1.tar.gz rockbox-e3fc65cfff31bf71dc648280ad714d214b9666a1.zip |
change dependencies in make files:
* apps.make: depends on ctype.o instead of errno.o to depend on config-*.h so that it works for simulator.
* lang.make: add dependency of lang.h to make it sure that the file is updated properly when needed.
* plugins.make: object files don't depend on libpluginbitmaps.a.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24256 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/apps.make | 4 | ||||
-rw-r--r-- | apps/lang/lang.make | 2 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox.make | 2 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox.make | 2 | ||||
-rw-r--r-- | apps/plugins/pdbox/pdbox.make | 3 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.make | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox.make | 2 | ||||
-rw-r--r-- | tools/functions.make | 2 | ||||
-rw-r--r-- | tools/make.inc | 2 |
10 files changed, 12 insertions, 11 deletions
diff --git a/apps/apps.make b/apps/apps.make index 78ae121247..3717c5bd34 100644 --- a/apps/apps.make +++ b/apps/apps.make | |||
@@ -15,9 +15,9 @@ SRC += $(call preprocess, $(APPSDIR)/SOURCES) | |||
15 | # to genlang and thus (translated) phrases can be used based on those names. | 15 | # to genlang and thus (translated) phrases can be used based on those names. |
16 | # button.h is included for the HAS_BUTTON_HOLD define. | 16 | # button.h is included for the HAS_BUTTON_HOLD define. |
17 | # | 17 | # |
18 | # Kludge: depends on errno.o only to depend on config-*.h ... | 18 | # Kludge: depends on ctype.o only to depend on config-*.h ... |
19 | # | 19 | # |
20 | features $(BUILDDIR)/apps/features $(BUILDDIR)/apps/genlang-features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/errno.o | 20 | features $(BUILDDIR)/apps/features $(BUILDDIR)/apps/genlang-features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/ctype.o |
21 | $(SILENT)mkdir -p $(BUILDDIR)/apps | 21 | $(SILENT)mkdir -p $(BUILDDIR)/apps |
22 | $(SILENT)mkdir -p $(BUILDDIR)/lang | 22 | $(SILENT)mkdir -p $(BUILDDIR)/lang |
23 | $(call PRINTS,PP $(<F)) | 23 | $(call PRINTS,PP $(<F)) |
diff --git a/apps/lang/lang.make b/apps/lang/lang.make index f7366c9225..1b006a7468 100644 --- a/apps/lang/lang.make +++ b/apps/lang/lang.make | |||
@@ -32,6 +32,8 @@ $(BUILDDIR)/lang/lang_core.o: $(APPSDIR)/lang/$(LANGUAGE).lang $(BUILDDIR)/apps/ | |||
32 | perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $< | 32 | perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $< |
33 | $(call PRINTS,CC lang_core.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang/lang_core.c -o $@ | 33 | $(call PRINTS,CC lang_core.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang/lang_core.c -o $@ |
34 | 34 | ||
35 | $(BUILDDIR)/lang/lang.h: $(BUILDDIR)/lang/lang_core.o | ||
36 | |||
35 | $(BUILDDIR)/%.lng : $(ROOTDIR)/%.lang $(BUILDDIR)/apps/genlang-features | 37 | $(BUILDDIR)/%.lng : $(ROOTDIR)/%.lang $(BUILDDIR)/apps/genlang-features |
36 | $(call PRINTS,GENLANG $(subst $(ROOTDIR)/,,$<)) | 38 | $(call PRINTS,GENLANG $(subst $(ROOTDIR)/,,$<)) |
37 | $(SILENT)mkdir -p $(dir $@) | 39 | $(SILENT)mkdir -p $(dir $@) |
diff --git a/apps/plugins/chessbox/chessbox.make b/apps/plugins/chessbox/chessbox.make index 43df3ab264..7611b5bb1a 100644 --- a/apps/plugins/chessbox/chessbox.make +++ b/apps/plugins/chessbox/chessbox.make | |||
@@ -53,6 +53,6 @@ $(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS) | |||
53 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 53 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ |
54 | 54 | ||
55 | # special pattern rule for compiling chessbox with extra flags | 55 | # special pattern rule for compiling chessbox with extra flags |
56 | $(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(CHESSBOX_SRCDIR)/chessbox.make | 56 | $(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(CHESSBOX_SRCDIR)/chessbox.make |
57 | $(SILENT)mkdir -p $(dir $@) | 57 | $(SILENT)mkdir -p $(dir $@) |
58 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(CHESSBOXFLAGS) -c $< -o $@ | 58 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(CHESSBOXFLAGS) -c $< -o $@ |
diff --git a/apps/plugins/pacbox/pacbox.make b/apps/plugins/pacbox/pacbox.make index 83e19f8051..ae0147dead 100644 --- a/apps/plugins/pacbox/pacbox.make +++ b/apps/plugins/pacbox/pacbox.make | |||
@@ -22,6 +22,6 @@ PACBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O2 | |||
22 | 22 | ||
23 | $(PACBOXBUILDDIR)/pacbox.rock: $(PACBOX_OBJ) | 23 | $(PACBOXBUILDDIR)/pacbox.rock: $(PACBOX_OBJ) |
24 | 24 | ||
25 | $(PACBOXBUILDDIR)/%.o: $(PACBOXSRCDIR)/%.c $(PLUGINBITMAPLIB) $(PACBOXSRCDIR)/pacbox.make | 25 | $(PACBOXBUILDDIR)/%.o: $(PACBOXSRCDIR)/%.c $(PACBOXSRCDIR)/pacbox.make |
26 | $(SILENT)mkdir -p $(dir $@) | 26 | $(SILENT)mkdir -p $(dir $@) |
27 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PACBOXFLAGS) -c $< -o $@ | 27 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PACBOXFLAGS) -c $< -o $@ |
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make index c4bc5d2fa9..75af9c06c0 100644 --- a/apps/plugins/pdbox/pdbox.make +++ b/apps/plugins/pdbox/pdbox.make | |||
@@ -26,7 +26,6 @@ PDBOXFLAGS = $(PLUGINFLAGS) \ | |||
26 | -I$(PDBOXSRCDIR)/TLSF-2.4.4/src | 26 | -I$(PDBOXSRCDIR)/TLSF-2.4.4/src |
27 | 27 | ||
28 | # Compile PDBox with extra flags (adapted from ZXBox) | 28 | # Compile PDBox with extra flags (adapted from ZXBox) |
29 | $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PLUGINBITMAPLIB) $(PDBOXSRCDIR)/pdbox.make | 29 | $(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make |
30 | $(SILENT)mkdir -p $(dir $@) | 30 | $(SILENT)mkdir -p $(dir $@) |
31 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PDBOXFLAGS) -c $< -o $@ | 31 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PDBOXFLAGS) -c $< -o $@ |
32 | |||
diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make index c1fb1f3957..28ad2aa39e 100644 --- a/apps/plugins/pictureflow/pictureflow.make +++ b/apps/plugins/pictureflow/pictureflow.make | |||
@@ -53,6 +53,6 @@ $(PICTUREFLOW_OBJDIR)/pictureflow.ovl: $(PICTUREFLOW_OBJ) $(PICTUREFLOW_OUTLDS) | |||
53 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 53 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ |
54 | 54 | ||
55 | # special pattern rule for compiling pictureflow with extra flags | 55 | # special pattern rule for compiling pictureflow with extra flags |
56 | $(PICTUREFLOW_OBJDIR)/%.o: $(PICTUREFLOW_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(PICTUREFLOW_SRCDIR)/pictureflow.make | 56 | $(PICTUREFLOW_OBJDIR)/%.o: $(PICTUREFLOW_SRCDIR)/%.c $(PICTUREFLOW_SRCDIR)/pictureflow.make |
57 | $(SILENT)mkdir -p $(dir $@) | 57 | $(SILENT)mkdir -p $(dir $@) |
58 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PICTUREFLOWFLAGS) -c $< -o $@ | 58 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PICTUREFLOWFLAGS) -c $< -o $@ |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 4c20a84835..62640ab630 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -76,7 +76,7 @@ $(BUILDDIR)/apps/plugins/lib/%.o: $(ROOTDIR)/apps/plugins/lib/%.c | |||
76 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -ffunction-sections -fdata-sections -c $< -o $@ | 76 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -ffunction-sections -fdata-sections -c $< -o $@ |
77 | 77 | ||
78 | # special pattern rule for compiling plugins with extra flags | 78 | # special pattern rule for compiling plugins with extra flags |
79 | $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c $(PLUGINBITMAPLIB) | 79 | $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c |
80 | $(SILENT)mkdir -p $(dir $@) | 80 | $(SILENT)mkdir -p $(dir $@) |
81 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ | 81 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ |
82 | 82 | ||
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make index 24f8e91f20..04c85407e1 100644 --- a/apps/plugins/zxbox/zxbox.make +++ b/apps/plugins/zxbox/zxbox.make | |||
@@ -48,6 +48,6 @@ $(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS) | |||
48 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ | 48 | $(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@ |
49 | 49 | ||
50 | # special pattern rule for compiling zxbox with extra flags | 50 | # special pattern rule for compiling zxbox with extra flags |
51 | $(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make | 51 | $(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(ZXBOX_SRCDIR)/zxbox.make |
52 | $(SILENT)mkdir -p $(dir $@) | 52 | $(SILENT)mkdir -p $(dir $@) |
53 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(ZXBOXFLAGS) -c $< -o $@ | 53 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(ZXBOXFLAGS) -c $< -o $@ |
diff --git a/tools/functions.make b/tools/functions.make index 045354da66..748263359e 100644 --- a/tools/functions.make +++ b/tools/functions.make | |||
@@ -34,7 +34,7 @@ c2obj = $(addsuffix .o,$(basename $(subst $(ROOTDIR),$(BUILDDIR),$(1)))) | |||
34 | # to a file $(1)_, to be later renamed to $(1). | 34 | # to a file $(1)_, to be later renamed to $(1). |
35 | mkdepfile = $(shell \ | 35 | mkdepfile = $(shell \ |
36 | perl $(TOOLSDIR)/multigcc.pl $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h -- $(2) | \ | 36 | perl $(TOOLSDIR)/multigcc.pl $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h -- $(2) | \ |
37 | sed -e "s: lang.h: lang/lang_core.o:" \ | 37 | sed -e "s: lang.h: lang/lang.h:" \ |
38 | -e 's:_asmdefs.o:_asmdefs.h:' \ | 38 | -e 's:_asmdefs.o:_asmdefs.h:' \ |
39 | -e "s: max_language_size.h: lang/max_language_size.h:" | \ | 39 | -e "s: max_language_size.h: lang/max_language_size.h:" | \ |
40 | $(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) \ | 40 | $(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) \ |
diff --git a/tools/make.inc b/tools/make.inc index 601b892bfc..5521612f62 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -45,7 +45,7 @@ $(DEPFILE): $(SOURCES) | |||
45 | rm $$del; \ | 45 | rm $$del; \ |
46 | del=""; \ | 46 | del=""; \ |
47 | fi \ | 47 | fi \ |
48 | done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang/lang_core.o:" \ | 48 | done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang/lang.h:" \ |
49 | -e "s:[^[:space:]]*sysfont.h:$(BUILDDIR)/sysfont.h:" \ | 49 | -e "s:[^[:space:]]*sysfont.h:$(BUILDDIR)/sysfont.h:" \ |
50 | -e "s:[^[:space:]]*max_language_size.h:$(BUILDDIR)/max_language_size.h:" \ | 50 | -e "s:[^[:space:]]*max_language_size.h:$(BUILDDIR)/max_language_size.h:" \ |
51 | -e "s: bitmaps/: $(BUILDDIR)/bitmaps/:g" \ | 51 | -e "s: bitmaps/: $(BUILDDIR)/bitmaps/:g" \ |