X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=3aa1a795af132d4c105ed4c7ac2358ebbbaf61c1;hb=881a49e0164c582d24db527e474f587a8b5e0c32;hp=fd8bc45121d0961d89ed9bd1fac075d0d770341b;hpb=4f6ab5fa31fb60ddd8085783c8d21a48cab4c674;p=tpg%2Facess2.git diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg index fd8bc451..3aa1a795 100644 --- a/Usermode/Applications/Makefile.cfg +++ b/Usermode/Applications/Makefile.cfg @@ -1,14 +1,12 @@ # Acess 2 Applications # General Makefile --include ../../../Makefile.cfg -# satisfying 2 deep applications -if $(ACESSDIR) == "" then - -include ../../../../Makefile.cfg -#endif -ACESSUSERDIR := $(ACESSDIR)/Usermode +# Include Usermode Makefile.cfg +include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg ASFLAGS = -felf CPPFLAGS = -I$(ACESSUSERDIR)/include/ CFLAGS = -fno-stack-protector $(CPPFLAGS) -LDFLAGS = -T $(ACESSUSERDIR)/Libraries/acess.ld -L $(ACESSUSERDIR)/Libraries -I /Acess/Libs/ld-acess.so -lc +LDFLAGS = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc + +DIR = Bin