ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:r0ket/r0ket

This commit is contained in:
schneider 2011-12-19 21:46:37 +01:00
parent 1c924ec370 a3cbf8cd3f
commit 5f584adb82
1 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/applications/Makefile
View File

@ -4,6 +4,10 @@
OBJS = OBJS =
ifndef APP
APP=final
endif
ifeq "$(APP)" "initial" ifeq "$(APP)" "initial"
NODEFAULT = y NODEFAULT = y
endif endif
@ -20,20 +24,6 @@ OBJS += $(foreach mod,$(APP),$(mod).o)
SRCS = $(foreach mod,$(APP),$(mod).c) SRCS = $(foreach mod,$(APP),$(mod).c)
ifndef APP
ME_OBJ=final
ifeq "$(ME_OBJ)" ""
ME_OBJ=$(USER)
endif
ifeq "$(ME_OBJ)" ""
ME_OBJ=nouser
endif
OBJS += $(ME_OBJ).o
endif
WRAP=wrapper WRAP=wrapper
LIBNAME=app LIBNAME=app
@ -60,21 +50,6 @@ endif
all: $(LIBFILE) all: $(LIBFILE)
ifeq "$(APP)" "loadable"
ifndef LAPP
LAPP=blinktest
endif
LSRC=../loadable/$(LAPP).c
LOBJ=loadable_$(LAPP).o
.PHONY: $(LOBJ)
$(LOBJ):
$(CC) $(CFLAGS) -o $@ $(LSRC)
OBJS += $(LOBJ)
endif
ifeq "$(APP)" "l0dable" ifeq "$(APP)" "l0dable"
ifndef LAPP ifndef LAPP
LAPP=blinktest LAPP=blinktest