From: John Hodge <tpg@mutabah.net>
Date: Wed, 4 Jul 2012 13:34:16 +0000 (+0800)
Subject: Usermode - Fixes to magic non-recusive build
X-Git-Tag: rel0.15~611^2~45
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=94c9ee44d701154379842425b5ee0826995e000e;hp=06b7785db75c00e02705977d77685972831d070e;p=tpg%2Facess2.git

Usermode - Fixes to magic non-recusive build
---

diff --git a/Usermode/Applications/ip_src/rules.mk b/Usermode/Applications/ip_src/rules.mk
index f420eb80..4dff1147 100644
--- a/Usermode/Applications/ip_src/rules.mk
+++ b/Usermode/Applications/ip_src/rules.mk
@@ -3,7 +3,7 @@
 include $(BASE)header.mk
 
 # Variables
-SRCS := main.c
+SRCS := main.c addr.c routes.c
 BIN  := $(OUTPUTDIR)Bin/ifconfig
 
 LDFLAGS-$(DIR) += -lnet
diff --git a/Usermode/Applications/rules.mk b/Usermode/Applications/rules.mk
index fb4d8eb3..5779b3db 100644
--- a/Usermode/Applications/rules.mk
+++ b/Usermode/Applications/rules.mk
@@ -2,7 +2,8 @@ include $(BASE)header.mk
 
 # Rules
 ASFLAGS-$(DIR)  := -felf -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
-CPPFLAGS-$(DIR) := -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
+CPPFLAGS-$(DIR) := -ffreestanding -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
+CPPFLAGS-$(DIR) += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
 CFLAGS-$(DIR)   := -g -Wall -fno-stack-protector -O3
 LDFLAGS-$(DIR)  := -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc $(OUTPUTDIR)Libs/crtbegin.o $(OUTPUTDIR)Libs/crtend.o
 
diff --git a/Usermode/Libraries/rules.mk b/Usermode/Libraries/rules.mk
index 4786df96..5bac18fe 100644
--- a/Usermode/Libraries/rules.mk
+++ b/Usermode/Libraries/rules.mk
@@ -4,7 +4,8 @@ include $(BASE)header.mk
 
 # Rules
 ASFLAGS-$(DIR)  := -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
-CPPFLAGS-$(DIR) := -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
+CPPFLAGS-$(DIR) := -ffreestanding -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
+CPPFLAGS-$(DIR) += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
 CFLAGS-$(DIR)   := -g -Wall -fPIC -fno-stack-protector -O3
 LDFLAGS-$(DIR)  := -g -nostdlib -shared -I/Acess/Libs/ld-acess.so -lld-acess -e SoMain -x -L$(OUTPUTDIR)Libs/ --no-undefined