freemyipod r33 - Code Review

Jump to: navigation, search
Repository:freemyipod
Revision:< r32‎ | r33 | r34 >
Date:01:01, 6 August 2010
Author:theseven
Status:new
Tags:
Comment:
Further Makefile fixes to make the build server happy
Modified paths:
  • /embios/trunk/Makefile (modified) (history)

Diff [purge]

Index: embios/trunk/Makefile
——@@ -1,6 +1,6 @@
22 NAME := embios
33
4 -CROSS := arm-none-eabi-
 4+CROSS ?= arm-none-eabi-
55 CC := $(CROSS)gcc
66 AS := $(CROSS)as
77 LD := $(CROSS)ld
——@@ -7,8 +7,8 @@
88 OBJCOPY := $(CROSS)objcopy
99 UCLPACK := ucl2e10singleblk
1010
11 -CFLAGS ?= -Os -fno-pie -fno-stack-protector -fomit-frame-pointer -I. -ffunction-sections -fdata-sections
12 -LDFLAGS ?= "$(shell $(CC) -print-libgcc-file-name)" --gc-sections
 11+CFLAGS += -Os -fno-pie -fno-stack-protector -fomit-frame-pointer -I. -ffunction-sections -fdata-sections
 12+LDFLAGS += "$(shell $(CC) -print-libgcc-file-name)" --gc-sections
1313
1414 preprocess = $(shell $(CC) $(PPCFLAGS) $(2) -E -P -x c $(1) | grep -v "^\#")
1515 preprocesspaths = $(shell $(CC) $(PPCFLAGS) $(2) -E -P -x c $(1) | grep -v "^\#" | sed -e "s:^..*:$(dir $(1))&:")
——@@ -48,7 +48,7 @@
4949 ifeq ($(shell uname),WindowsNT)
5050 @sed -e "s/.*://" -e "s/\\$$$$//" < $$@.dep.tmp | fmt -1 | sed -e "s/^ *//" -e "s/$$$$/:/" >> $$@.dep
5151 else
52 - @sed -e "s/.*://" -e "s/\\\\$$$$//" < $$@.dep.tmp | fmt -1 | sed -e "s/^ *//" -e "s/$$$$/:/" >> $$@.dep
 52+ @sed -e 's/.*://' -e 's/\\$$$$//' < $$@.dep.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$$$/:/' >> $$@.dep
5353 endif
5454 @rm -f $$@.dep.tmp
5555
——@@ -64,7 +64,7 @@
6565 ifeq ($(shell uname),WindowsNT)
6666 @sed -e "s/.*://" -e "s/\\$$$$//" < $$@.dep.tmp | fmt -1 | sed -e "s/^ *//" -e "s/$$$$/:/" >> $$@.dep
6767 else
68 - @sed -e "s/.*://" -e "s/\\\\$$$$//" < $$@.dep.tmp | fmt -1 | sed -e "s/^ *//" -e "s/$$$$/:/" >> $$@.dep
 68+ @sed -e 's/.*://' -e 's/\\$$$$//' < $$@.dep.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$$$/:/' >> $$@.dep
6969 endif
7070 @rm -f $$@.dep.tmp
7171 endef
——@@ -77,11 +77,11 @@
7878 ifeq ($(shell uname),WindowsNT)
7979 @sed -e "s/\$$REVISION\$$/$(REVISION)/" -e "s/\$$REVISIONINT\$$/$(REVISIONINT)/" < $< > $@
8080 else
81 - @sed -e "s/\\$$REVISION\\$$/$(REVISION)/" -e "s/\\$$REVISIONINT\\$$/$(REVISIONINT)/" < $< > $@
 81+ @sed -e 's/\$$REVISION\$$/$(REVISION)/' -e 's/\$$REVISIONINT\$$/$(REVISIONINT)/' < $< > $@
8282 endif
8383
8484 build:
85 - @mkdir build
 85+ @mkdir $@
8686
8787 clean:
8888 rm -rf build
Retrieved from "https://freemyipod.org/wiki/Special:Code/freemyipod/33"