projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from triface project.
[bertos.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index fe7c8128ea6f4a762f9d7f3e4b171d3736e2d127..989b43f796507b04ddd96df0a9b2426504f6baa4 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-14,7
+14,7
@@
default: all
include config.mk
# Include subtargets
include config.mk
# Include subtargets
-include app/demo/demo.mk
-
#
include app/triface/triface.mk
+
#
include app/demo/demo.mk
+include app/triface/triface.mk
#include app/at91sam7s/at91sam7s.mk
include rules.mk
#include app/at91sam7s/at91sam7s.mk
include rules.mk