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) | |
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 .PHONY: $(SUBDIRS) all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) -$(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS +$(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS @echo "create credits.raw" @perl credits.pl < $< > $@ -$(OBJDIR)/credits.o: credits.c $(OBJDIR)/credits.raw +$(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw @mkdir -p `dirname $@` @echo "CC $<" @$(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) $(SILENT)mkdir -p `dirname $(DEPFILE)` $(SILENT)rm -f $(DEPFILE) $(SILENT)(if test ! -f $(BUILDDIR)/lang.h; then \ + del="$(BUILDDIR)/lang.h"; \ touch $(BUILDDIR)/lang.h; \ fi; \ for each in $(SOURCES) x; do \ + if test "$$each" = "credits.c"; then \ + del="$$del$(BUILDDIR)/credits.raw"; \ + touch $(BUILDDIR)/credits.raw; \ + fi; \ if test "x" != "$$each"; then \ obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ $(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \ fi; \ + if test -n "$$del"; then \ + rm $$del; \ + del=""; \ + fi \ done; \ echo "oo" >/dev/null ) |