git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed logging to support 8-charater identifiers
[tpg/acess2.git]
/
Usermode
/
Applications
/
Makefile.cfg
diff --git
a/Usermode/Applications/Makefile.cfg
b/Usermode/Applications/Makefile.cfg
index
f8cd151
..
bc33f90
100644
(file)
--- a/
Usermode/Applications/Makefile.cfg
+++ b/
Usermode/Applications/Makefile.cfg
@@
-2,8
+2,14
@@
# General Makefile
-include ../../../Makefile.cfg
# General Makefile
-include ../../../Makefile.cfg
+# satisfying 2 deep applications
+ifeq ($(ACESSDIR),)
+ -include ../../../../Makefile.cfg
+endif
+ACESSUSERDIR := $(ACESSDIR)/Usermode
ASFLAGS = -felf
ASFLAGS = -felf
-CPPFLAGS = -I
../..
/include/
+CPPFLAGS = -I
$(ACESSUSERDIR)
/include/
CFLAGS = -fno-stack-protector $(CPPFLAGS)
CFLAGS = -fno-stack-protector $(CPPFLAGS)
-LDFLAGS = -T ../../Libraries/acess.ld -I /Acess/Libs/ld-acess.so -lc
+LDFLAGS = -T $(ACESSUSERDIR)/Libraries/acess.ld -L $(ACESSUSERDIR)/Libraries -I /Acess/Libs/ld-acess.so -lc
+DIR = Bin
UCC
git Repository :: git.ucc.asn.au