diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-01-16 22:45:44 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-01-16 22:45:44 +0000 |
commit | 137501b9ac11032f57c63b4f90ec9379bf134b08 (patch) | |
tree | a1eb4cac2ce5a6e745b2701aca790383bd75ba36 | |
parent | ffb0cdc4263c5c5f4b13fd7514533f4d17fa2a3b (diff) | |
download | rockbox-137501b9ac11032f57c63b4f90ec9379bf134b08.tar.gz rockbox-137501b9ac11032f57c63b4f90ec9379bf134b08.zip |
The dependency generation for credits.c failed since it includes a file
that does't exist when gcc -MM is used. Thus we do one more work-around that
creates the file before depedency generation and then removes it again
afterwards...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8355 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/Makefile | 4 | ||||
-rw-r--r-- | tools/make.inc | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 2ed1a101bb..8464e93586 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -52,11 +52,11 @@ endif | |||
52 | .PHONY: $(SUBDIRS) | 52 | .PHONY: $(SUBDIRS) |
53 | all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) | 53 | all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) |
54 | 54 | ||
55 | $(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS | 55 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS |
56 | @echo "create credits.raw" | 56 | @echo "create credits.raw" |
57 | @perl credits.pl < $< > $@ | 57 | @perl credits.pl < $< > $@ |
58 | 58 | ||
59 | $(OBJDIR)/credits.o: credits.c $(OBJDIR)/credits.raw | 59 | $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw |
60 | @mkdir -p `dirname $@` | 60 | @mkdir -p `dirname $@` |
61 | @echo "CC $<" | 61 | @echo "CC $<" |
62 | @$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ | 62 | @$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ |
diff --git a/tools/make.inc b/tools/make.inc index b5eae4430e..5a2ed800a6 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -29,13 +29,22 @@ $(DEPFILE): $(SOURCES) | |||
29 | $(SILENT)mkdir -p `dirname $(DEPFILE)` | 29 | $(SILENT)mkdir -p `dirname $(DEPFILE)` |
30 | $(SILENT)rm -f $(DEPFILE) | 30 | $(SILENT)rm -f $(DEPFILE) |
31 | $(SILENT)(if test ! -f $(BUILDDIR)/lang.h; then \ | 31 | $(SILENT)(if test ! -f $(BUILDDIR)/lang.h; then \ |
32 | del="$(BUILDDIR)/lang.h"; \ | ||
32 | touch $(BUILDDIR)/lang.h; \ | 33 | touch $(BUILDDIR)/lang.h; \ |
33 | fi; \ | 34 | fi; \ |
34 | for each in $(SOURCES) x; do \ | 35 | for each in $(SOURCES) x; do \ |
36 | if test "$$each" = "credits.c"; then \ | ||
37 | del="$$del$(BUILDDIR)/credits.raw"; \ | ||
38 | touch $(BUILDDIR)/credits.raw; \ | ||
39 | fi; \ | ||
35 | if test "x" != "$$each"; then \ | 40 | if test "x" != "$$each"; then \ |
36 | obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ | 41 | obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ |
37 | $(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \ | 42 | $(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \ |
38 | fi; \ | 43 | fi; \ |
44 | if test -n "$$del"; then \ | ||
45 | rm $$del; \ | ||
46 | del=""; \ | ||
47 | fi \ | ||
39 | done; \ | 48 | done; \ |
40 | echo "oo" >/dev/null ) | 49 | echo "oo" >/dev/null ) |
41 | 50 | ||