diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-02-09 04:27:57 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-02-09 04:27:57 +0000 |
commit | 4872825ed2c71e8bb2520681035355b24759d442 (patch) | |
tree | 6010975d41d02a86eed1e3293755f188d3e7a779 /tools/make.inc | |
parent | 8fee5282bad592d33e623bf7dba3de7fee992363 (diff) | |
download | rockbox-4872825ed2c71e8bb2520681035355b24759d442.tar.gz rockbox-4872825ed2c71e8bb2520681035355b24759d442.zip |
Various build sytem cleanups
* Parallel build appears to work properly
* Use $(SILENT) instead of @ about everywhere
* Less calls to bash by using make builtin substitutions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8638 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/make.inc')
-rw-r--r-- | tools/make.inc | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/tools/make.inc b/tools/make.inc index 5a2ed800a6..344fa23543 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -28,25 +28,21 @@ $(OBJDIR)/%.o: %.S | |||
28 | $(DEPFILE): $(SOURCES) | 28 | $(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)(for each in $(SOURCES) x; do \ |
32 | del="$(BUILDDIR)/lang.h"; \ | 32 | if test "$$each" = "credits.c"; then \ |
33 | touch $(BUILDDIR)/lang.h; \ | 33 | del="$$del$(BUILDDIR)/credits.raw"; \ |
34 | fi; \ | 34 | touch $(BUILDDIR)/credits.raw; \ |
35 | for each in $(SOURCES) x; do \ | 35 | fi; \ |
36 | if test "$$each" = "credits.c"; then \ | 36 | if test "x" != "$$each"; then \ |
37 | del="$$del$(BUILDDIR)/credits.raw"; \ | 37 | obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ |
38 | touch $(BUILDDIR)/credits.raw; \ | 38 | $(CC) -MG -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each 2>/dev/null; \ |
39 | fi; \ | 39 | fi; \ |
40 | if test "x" != "$$each"; then \ | 40 | if test -n "$$del"; then \ |
41 | obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ | 41 | rm $$del; \ |
42 | $(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \ | 42 | del=""; \ |
43 | fi; \ | 43 | fi \ |
44 | if test -n "$$del"; then \ | 44 | done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" > $(DEPFILE); \ |
45 | rm $$del; \ | 45 | echo "oo" > /dev/null ) |
46 | del=""; \ | ||
47 | fi \ | ||
48 | done; \ | ||
49 | echo "oo" >/dev/null ) | ||
50 | 46 | ||
51 | tags: | 47 | tags: |
52 | $(SILENT)(for d in $(DIRS); do \ | 48 | $(SILENT)(for d in $(DIRS); do \ |