X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=2e64b9d6ba41c63b634c95ba5d7cbf632a062605;hb=4726431cb7e0bada749b32f9e51dedadf882d50b;hp=0418fb777f1913663b4374c8fc3f37c27c794900;hpb=79b27f40907a5050a2512d11703ab9bba3f64ec0;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 0418fb77..2e64b9d6 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -1,14 +1,18 @@
 # Acess 2 Applications
 # General Makefile
 
--include ../../../Makefile.cfg
+#-include ../../../Makefile.cfg
 # satisfying 2 deep applications
-ifeq ($(ACESSDIR),)
-	-include ../../../../Makefile.cfg
-endif
-ACESSUSERDIR := $(ACESSDIR)/Usermode
+#ifeq ($(ACESSDIR),)
+#	-include ../../../../Makefile.cfg
+#endif
+
+# 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