From a4ce8c5c8725f0ac46c4b23a5253842ac0f1c284 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 28 Jun 2010 18:21:22 +0200 Subject: [PATCH] initial commit --- firmware/firmware.make | 6 +++--- lib/skin_parser/skin_parser.make | 2 +- tools/root.make | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/firmware/firmware.make b/firmware/firmware.make index 9d023ab27..e7c2238f4 100644 --- a/firmware/firmware.make +++ b/firmware/firmware.make @@ -34,14 +34,14 @@ endif $(FIRMLIB): $(FIRMLIB_OBJ) $(SILENT)$(shell rm -f $@) - $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null + $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null $(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $< $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $< - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@ SVNVERSION:=$(shell $(TOOLSDIR)/version.sh $(ROOTDIR)) OLDSVNVERSION:=$(shell grep 'RBVERSION' $(BUILDDIR)/version.h 2>/dev/null|cut -d '"' -f 2 || echo "NOREVISION") @@ -51,4 +51,4 @@ ifneq ($(SVNVERSION),$(OLDSVNVERSION)) endif $(BUILDDIR)/version.h: - $(call PRINTS,GEN $(@F))$(TOOLSDIR)/genversion.sh $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR) + $(call PRINTS,GEN $(@F))$(TOOLSDIR)/genversion.sh $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR) diff --git a/lib/skin_parser/skin_parser.make b/lib/skin_parser/skin_parser.make index c73fc6ef0..7e35e556f 100644 --- a/lib/skin_parser/skin_parser.make +++ b/lib/skin_parser/skin_parser.make @@ -17,4 +17,4 @@ INCLUDES += -I$(SKINP_DIR) $(SKINLIB): $(SKINP_OBJ) $(SILENT)$(shell rm -f $@) - $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null + $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null diff --git a/tools/root.make b/tools/root.make index 0141a26b6..19eb5f076 100644 --- a/tools/root.make +++ b/tools/root.make @@ -321,11 +321,11 @@ help: # when source and object are in different locations (normal): $(BUILDDIR)/%.o: $(ROOTDIR)/%.c $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ # generated definitions for use in .S files $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c @@ -336,11 +336,11 @@ $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c # when source and object are both in BUILDDIR (generated code): %.o: %.c $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ %.o: %.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ Makefile: $(TOOLSDIR)/configure ifneq (reconf,$(MAKECMDGOALS)) -- 2.11.4.GIT