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
Externals/common.mk - Fixed depenency issues
[tpg/acess2.git]
/
Usermode
/
Libraries
/
Makefile.cfg
diff --git
a/Usermode/Libraries/Makefile.cfg
b/Usermode/Libraries/Makefile.cfg
index
c3cb7b1
..
330f55b
100644
(file)
--- a/
Usermode/Libraries/Makefile.cfg
+++ b/
Usermode/Libraries/Makefile.cfg
@@
-1,7
+1,8
@@
# Acess 2 Libraries
# General Makefile
# Acess 2 Libraries
# General Makefile
--include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
+_libsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+-include $(_libsdir)../Makefile.cfg
MAKEDEP = $(CC) -M
MAKEDEP = $(CC) -M
@@
-19,9
+20,8
@@
CPPFLAGS := -ffreestanding
CFLAGS := -fno-stack-protector -fPIC
LDFLAGS := -I/Acess/Libs/ld-acess.so -lld-acess `$(CC) -print-libgcc-file-name`
endif
CFLAGS := -fno-stack-protector -fPIC
LDFLAGS := -I/Acess/Libs/ld-acess.so -lld-acess `$(CC) -print-libgcc-file-name`
endif
-CPPFLAGS += -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
-CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
-CFLAGS += -Wall -g
LDFLAGS += -g -nostdlib -shared -eSoMain -x --no-undefined -L$(OUTPUTDIR)Libs/
LDFLAGS += -g -nostdlib -shared -eSoMain -x --no-undefined -L$(OUTPUTDIR)Libs/
+-include $(_libsdir)../common_settings.mk
+
# vim: ft=make
# vim: ft=make
UCC
git Repository :: git.ucc.asn.au