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

Consistently use curly brackets for function calls.

Browse source
This commit is contained in:
oliverschmidt 2007-04-14 18:37:06 +00:00
parent c7e8ac499e
commit 8b7de528fb
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile.include
View file

@ -1,5 +1,5 @@
ifndef CONTIKI ifndef CONTIKI
$(error CONTIKI not defined! You must specify where CONTIKI resides!) ${error CONTIKI not defined! You must specify where CONTIKI resides!}
endif endif
OBJECTDIR = obj_$(TARGET) OBJECTDIR = obj_$(TARGET)
@ -8,10 +8,10 @@ CFLAGS += -DCONTIKI_TARGET=$(TARGET)
ifeq ($(TARGET),) ifeq ($(TARGET),)
-include Makefile.target -include Makefile.target
ifeq ($(TARGET),) ifeq ($(TARGET),)
$(warning TARGET not defined, using native target) ${warning TARGET not defined, using native target}
TARGET=native TARGET=native
else else
$(warning using saved target '$(TARGET)') ${warning using saved target '$(TARGET)'}
endif endif
endif endif
@ -59,11 +59,11 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,$(PROJECT_SOURCEFILES:.c=.o)}
### Include application makefiles ### Include application makefiles
ifdef APPS ifdef APPS
APPDIRS += $(addprefix $(CONTIKI)/apps/, $(APPS)) APPDIRS += ${addprefix $(CONTIKI)/apps/, $(APPS)}
APPINCLUDES = $(foreach APP, $(APPS), $(CONTIKI)/apps/$(APP)/Makefile.$(APP)) APPINCLUDES = ${foreach APP, $(APPS), $(CONTIKI)/apps/$(APP)/Makefile.$(APP)}
-include $(APPINCLUDES) -include $(APPINCLUDES)
APP_SOURCES = $(foreach APP, $(APPS), $($(APP)_src)) APP_SOURCES = ${foreach APP, $(APPS), $($(APP)_src)}
DSC_SOURCES = $(foreach APP, $(APPS), $($(APP)_dsc)) DSC_SOURCES = ${foreach APP, $(APPS), $($(APP)_dsc)}
CONTIKI_SOURCEFILES += $(APP_SOURCES) $(DSC_SOURCES) CONTIKI_SOURCEFILES += $(APP_SOURCES) $(DSC_SOURCES)
endif endif
@ -73,8 +73,8 @@ include $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET)
### Automatic dependency generation ### Automatic dependency generation
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include $(addprefix $(OBJECTDIR)/,$(CONTIKI_SOURCEFILES:.c=.d) \ -include ${addprefix $(OBJECTDIR)/,$(CONTIKI_SOURCEFILES:.c=.d) \
$(PROJECT_SOURCEFILES:.c=.d)) $(PROJECT_SOURCEFILES:.c=.d)}
endif endif
@ -140,7 +140,7 @@ endif
ifndef CUSTOM_RULE_LINK ifndef CUSTOM_RULE_LINK
%.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a %.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a
$(LD) $(LDFLAGS) $(TARGET_STARTFILES) $(filter-out %.a,$^) $(filter %.a,$^) $(TARGET_LIBFILES) -o $@ $(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} ${filter %.a,$^} $(TARGET_LIBFILES) -o $@
endif endif
# The target below looks weird, but I had to add the @ to avoid complaints # The target below looks weird, but I had to add the @ to avoid complaints