projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start to merge old triface project in bertos, not working actually
[bertos.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index c899766b58e0f3e6d46c389a8176537d4739e462..ec9502e622b93e46968a635cfb728b5cd6fa7dc6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,9
+14,9
@@
default: all
include bertos/config.mk
#Include subtargets
include bertos/config.mk
#Include subtargets
-include app/demo/demo.mk
+
#
include app/demo/demo.mk
#include app/at91sam7s/at91sam7s.mk
#include app/battfs/battfs_test.mk
#include app/at91sam7s/at91sam7s.mk
#include app/battfs/battfs_test.mk
-
#
include app/triface/triface.mk
+include app/triface/triface.mk
include bertos/rules.mk
include bertos/rules.mk