From bb574fd1e2b9712b037c1231836e7ae1dc20f85c Mon Sep 17 00:00:00 2001 From: dak664 Date: Thu, 10 Mar 2011 14:59:21 -0500 Subject: [PATCH] Don't create an object directory if target does not exist --- Makefile.include | 8 ++++---- cpu/mc1322x/lib/maca.c | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile.include b/Makefile.include index 916d07df9..89dd09304 100644 --- a/Makefile.include +++ b/Makefile.include @@ -36,9 +36,6 @@ savedefines: @echo >Makefile.$(TARGET).defines "DEFINES = $(DEFINES)" OBJECTDIR = obj_$(TARGET) -ifeq (${wildcard $(OBJECTDIR)},) - DUMMY := ${shell mkdir $(OBJECTDIR)} -endif LOWERCASE = -abcdefghijklmnopqrstuvwxyz UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ @@ -109,10 +106,13 @@ endif target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET)) -# Check if the target makefile exists +# Check if the target makefile exists, and create the object directory if necessary. ifeq ($(strip $(target_makefile)),) ${error The target platform "$(TARGET)" does not exist (maybe it was misspelled?)} else + ifeq (${wildcard $(OBJECTDIR)},) + DUMMY := ${shell mkdir $(OBJECTDIR)} + endif include $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET) endif diff --git a/cpu/mc1322x/lib/maca.c b/cpu/mc1322x/lib/maca.c index 06f74a6aa..e039062c3 100644 --- a/cpu/mc1322x/lib/maca.c +++ b/cpu/mc1322x/lib/maca.c @@ -368,9 +368,7 @@ void post_receive(void) { ( 4 << PRECOUNT) | ( fcs_mode << NOFC ) | ( prm_mode << PRM) | -#if 0 //dak says removing ctrl auto fixes the autoack checksum error --- doesn't cause a performance issue either (1 << maca_ctrl_auto) | -#endif (maca_ctrl_seq_rx)); /* status bit 10 is set immediately */ /* then 11, 10, and 9 get set */