Fixing makefiles

[tpg/acess2.git] / Usermode / Applications / Makefile.cfg

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index bc33f90..2e64b9d 100644 (file)
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -1,15 +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