deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Workaround DEFAULT_GOAL so that you can use older versions of make.

Browse source 
From Jim.
This commit is contained in:
Mariano Alvira 2010-03-12 16:51:49 -05:00
parent 61ef708342
commit d0ea93c741
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile.include
View file

@ -1,5 +1,11 @@
# -*- makefile -*- # -*- makefile -*-
ifndef BOARD
default: allboards
else
default: all
endif
CROSS_COMPILE := arm-linux- CROSS_COMPILE := arm-linux-
LINKERSCRIPT := $(MC1322X)/mc1322x.lds LINKERSCRIPT := $(MC1322X)/mc1322x.lds
@ -118,14 +124,6 @@ clobber \
mrproper \ mrproper \
distclean: clean distclean: clean
#.DEFAULT_GOAL := all
ifndef BOARD
.DEFAULT_GOAL := allboards
else
.DEFAULT_GOAL := all
endif
all: $(OBJDIR)/board.h all: $(OBJDIR)/board.h
for target in $(TARGETS); do make $$target\_$(BOARD).bin; done for target in $(TARGETS); do make $$target\_$(BOARD).bin; done
for target in $(TARGETS_WITH_ROM_VARS); do make TARGET_ROM_VARS=1 $$target\_$(BOARD).bin; done for target in $(TARGETS_WITH_ROM_VARS); do make TARGET_ROM_VARS=1 $$target\_$(BOARD).bin; done

12
tests/Makefile
View file

@ -22,13 +22,9 @@ TARGETS_WITH_ROM_VARS := nvm-read nvm-write romimg flasher \
# you shouldn't need to edit anything below here # # you shouldn't need to edit anything below here #
################################################## ##################################################
need := 3.81 # This Makefile includes the default rule at the top
ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) \ # it needs to be included first
$(need)))) -include $(MC1322X)/Makefile.include
ifdef $(need)
$(error You need to use version 3.81 of Make or later)
endif
# this rule will become the default_goal if # this rule will become the default_goal if
# $(MC1322X)/Makefile.include doesn't exist it will try to update the # $(MC1322X)/Makefile.include doesn't exist it will try to update the
@ -39,7 +35,7 @@ submodule:
if [ ! -d $(MC1322X) ] ; then echo "*** cannot find MC1322X directory $(MC1322X)" ; exit 2; fi if [ ! -d $(MC1322X) ] ; then echo "*** cannot find MC1322X directory $(MC1322X)" ; exit 2; fi
$(MAKE) $(MAKE)
-include $(MC1322X)/Makefile.include