From cdef47c4251b8c84d020bc65f6da79f7abbab044 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sat, 8 Jun 2013 17:38:07 +0800
Subject: [PATCH] Usermode - Moved common portions of the Makefile.cfg files

---
 Usermode/Applications/Makefile.cfg | 26 ++++++++++++--------------
 Usermode/Libraries/Makefile.cfg    |  8 ++++----
 Usermode/common_settings.mk        |  7 +++++++
 3 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 Usermode/common_settings.mk

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 02283245..d449a165 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -2,26 +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 -lc_acess
+ 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)
+ 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)
-CFLAGS += -std=c99
+-include $(_appsdir)../common_settings.mk
 LDFLAGS += -rpath-link $(OUTPUTDIR)Libs
 
 # Extra-verbose errors!
diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index 8c75e8bc..330f55b6 100644
--- a/Usermode/Libraries/Makefile.cfg
+++ b/Usermode/Libraries/Makefile.cfg
@@ -1,7 +1,8 @@
 # Acess 2 Libraries
 # General Makefile
 
--include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
+_libsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+-include $(_libsdir)../Makefile.cfg
 
 MAKEDEP  = $(CC) -M
 
@@ -19,9 +20,8 @@ CPPFLAGS := -ffreestanding
 CFLAGS   := -fno-stack-protector -fPIC
 LDFLAGS  := -I/Acess/Libs/ld-acess.so -lld-acess `$(CC) -print-libgcc-file-name`
 endif
-CPPFLAGS += -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
-CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
-CFLAGS += -Wall -g -std=gnu99
 LDFLAGS += -g -nostdlib -shared -eSoMain -x --no-undefined -L$(OUTPUTDIR)Libs/
 
+-include $(_libsdir)../common_settings.mk
+
 # vim: ft=make
diff --git a/Usermode/common_settings.mk b/Usermode/common_settings.mk
new file mode 100644
index 00000000..519b0fd3
--- /dev/null
+++ b/Usermode/common_settings.mk
@@ -0,0 +1,7 @@
+
+
+CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
+CPPFLAGS += -I$(ACESSUSERDIR)/include/ -DARCHDIR_is_$(ARCHDIR)
+CPPFLAGS += -I $(ACESSDIR)/Externals/Output/$(ARCHDIR)/include
+CFLAGS += -std=gnu99 -g
+LDFLAGS += -L $(ACESSDIR)/Externals/Output/$(ARCHDIR)/lib
-- 
2.20.1