X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=a1a0141af4c82c9ab3ccc53a57e2756af49b6433;hb=2611b24a556e7881ef218e92b3ffc09a81339990;hp=2dbcfc285000d7d5781e75906a9aa21ee122dc34;hpb=bf0187772ecfb475eedf5e0e9b8460b4f1a3f445;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 2dbcfc28..a1a0141a 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -2,25 +2,24 @@
 # General Makefile
 
 # Include Usermode Makefile.cfg
-include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
+_appsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(_appsdir)../Makefile.cfg
 
 ifeq ($(ARCHDIR),native)
-ASFLAGS = -felf
-CPPFLAGS = -Wall
-CFLAGS = $(CPPFLAGS)
-LDFLAGS = -L $(OUTPUTDIR)Libs -lacess-native
+ ASFLAGS = -felf
+ CPPFLAGS = -Wall
+ CFLAGS = $(CPPFLAGS)
+ LDFLAGS = -L $(OUTPUTDIR)Libs -lacess-native -lc_acess
 #LIBGCC_PATH = $(ACESSDIR)/AcessNative/symbol_renames.ld
 else
-ASFLAGS = -felf
-CPPFLAGS = -ffreestanding
-CFLAGS   = -fno-stack-protector -fno-builtin $(CPPFLAGS)
-LDFLAGS  = -T $(OUTPUTDIR)Libs/acess.ld -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc $(OUTPUTDIR)Libs/crtbegin.o $(OUTPUTDIR)Libs/crtend.o -lposix
-LIBGCC_PATH = $(shell $(CC) -print-libgcc-file-name)
-
+ ASFLAGS = -felf
+ CPPFLAGS = -ffreestanding
+ CFLAGS   = -fno-stack-protector -fno-builtin $(CPPFLAGS) -Wall
+ LDFLAGS  = -T $(OUTPUTDIR)Libs/acess.ld -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc $(OUTPUTDIR)Libs/crtbegin.o $(OUTPUTDIR)Libs/crtend.o -lposix
+ LIBGCC_PATH = $(shell $(CC) -print-libgcc-file-name)
 endif
 
-CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
-CPPFLAGS += -I$(ACESSUSERDIR)/include/ -DARCHDIR_is_$(ARCHDIR)
+-include $(_appsdir)../common_settings.mk
 LDFLAGS += -rpath-link $(OUTPUTDIR)Libs
 
 # Extra-verbose errors!