From 5426fb5bd2f2563bd36f4d38fbfac75ab7cbeab6 Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 25 May 2008 12:35:42 +0000
Subject: [PATCH] CFLAGS for two packages changed, so that AROS builds on my
 machine (Ubuntu 8.04, GCC4.2, X86-32) again. See discussion "build system
 problems" in the AROS developer mailing list (2008-05-21).

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@28824 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 arch/all-unix/devs/networks/tap/mmakefile.src | 5 ++++-
 arch/all-x11/hidd/mmakefile.src               | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/all-unix/devs/networks/tap/mmakefile.src b/arch/all-unix/devs/networks/tap/mmakefile.src
index 1f6547250..3d154504e 100644
--- a/arch/all-unix/devs/networks/tap/mmakefile.src
+++ b/arch/all-unix/devs/networks/tap/mmakefile.src
@@ -1,11 +1,14 @@
 include $(TOP)/config/make.cfg
 
-USER_INCLUDES = -I$(GENINCDIR)
+#USER_INCLUDES = -I$(GENINCDIR)
+
+FLAGS := $(HOST_CFLAGS) -I$(GENINCDIR)
 
 %build_module mmake=workbench-devs-tap-unix \
     modname=tap modtype=device \
     moduledir=Devs/Networks \
     files="init command iotask" \
+    cflags=$(FLAGS) \
     uselibs="oop amiga rom m hiddstubs" \
     compiler=host
 
diff --git a/arch/all-x11/hidd/mmakefile.src b/arch/all-x11/hidd/mmakefile.src
index 5062b544a..3b075864b 100644
--- a/arch/all-x11/hidd/mmakefile.src
+++ b/arch/all-x11/hidd/mmakefile.src
@@ -6,8 +6,10 @@ include $(TOP)/config/make.cfg
 # and there doesn't seem to be a template for handling this case
 # so I write the file manually.
 
-USER_INCLUDES := -I$(GENINCDIR)
-USER_CFLAGS := -D__AROS__ $(HOST_X11_CFLAGS)
+#USER_INCLUDES := -I$(GENINCDIR)
+#USER_CFLAGS := -D__AROS__ $(HOST_X11_CFLAGS)
+
+FLAGS := $(HOST_CFLAGS) -I$(GENINCDIR)
 
 X11KEYMAPTABLE_FILE := $(AROS_DEVS)/Keymaps/X11/keycode2rawkey.table
 
@@ -18,6 +20,7 @@ FILES	   := x11_hostlib x11_init x11 support x11gfx onbitmap offbitmap x11kbd x1
 %build_module mmake=kernel-x11gfx \
   modname=x11gfx modtype=hidd \
   files=$(FILES) compiler=host \
+  cflags=$(FLAGS) \
   uselibs="oop hiddgraphicsstubs"
 
 #MM x11keymaptable
-- 
2.11.4.GIT