Move aros/config.h to config SDK

2020-11-24 11:23:40 +01:00 · 2020-11-24 11:23:40 +01:00 · b1e46df697
parent 6d705d6eb3
commit b1e46df697
46 changed files with 58 additions and 54 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -75,11 +75,11 @@ $(TOP)/compiler/include/geninc.cfg: $(SRCDIR)/compiler/include/geninc.cfg.in $(T

 CONFIGUREFILES += $(TOP)/compiler/include/geninc.cfg

-$(AROS_INCLUDES)/aros/config.h: $(SRCDIR)/config/config.h.in $(TOP)/config.status
+$(GENDIR)/buildsdks/config/include/aros/config.h: $(SRCDIR)/config/config.h.in $(TOP)/config.status
 	@+$(ECHO) "Regenerating " $(subst $(TOP)/,,$@); \
 	@$(TOP)/config.status --silent --file=$@:$<

-CONFIGUREFILES += $(AROS_INCLUDES)/aros/config.h
+CONFIGUREFILES += $(GENDIR)/buildsdks/config/include/aros/config.h

 $(GENINCDIR)/aros/config.h: $(SRCDIR)/config/config.h.in $(TOP)/config.status
 	@+$(ECHO) "Regenerating " $(subst $(TOP)/,,$@); \
@ -277,7 +277,7 @@ clean:
 	@$(CALL) $(MAKE) $(MKARGS) -C $(SRCDIR)/tools/setrev clean SRCDIR=$(SRCDIR) TOP=$(TOP)
 	-@$(RM) $(ARCHDIR) Makefile config.cache config.status config.log \
 		mmake.cache mmake.config rom/mmakefile config/make.cfg \
-		$(AROS_DEVELOPMENT)/include/aros/config.h \
+		$(GENDIR)/buildsdks/config/include/aros/config.h \
 		$(GENDIR)/include/aros/config.h $(HOSTGENDIR)/config/host.cfg \
 		$(GENDIR)/config/target.cfg $(GENDIR)/config/make.defaults \
 		$(GENDIR)/config/specs \
--- a/arch/all-native/kernel/mmakefile.src
+++ b/arch/all-native/kernel/mmakefile.src
@ -9,6 +9,6 @@ USER_INCLUDES  := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES)

 %build_archspecific \
  mainmmake=kernel-kernel modname=kernel maindir=$(MAINDIR) \
-  arch=native files="$(FILES)"
+  arch=native files="$(FILES)" usesdks="private config"

 %common
--- a/arch/all-pc/exec/mmakefile.src
+++ b/arch/all-pc/exec/mmakefile.src
@ -11,6 +11,6 @@ USER_INCLUDES := $(PRIV_EXEC_INCLUDES) -I$(SRCDIR)/rom/kernel -I$(SRCDIR)/arch/a

 %build_archspecific \
  mainmmake=kernel-exec maindir=rom/exec arch=pc \
-  files=$(FILES) modname=exec usesdks="private"
+  files=$(FILES) modname=exec usesdks="private config"

 %common
--- a/arch/all-pc/kernel/mmakefile.src
+++ b/arch/all-pc/kernel/mmakefile.src
@ -62,6 +62,6 @@ USER_INCLUDES  := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \

 %build_archspecific \
  mainmmake=kernel-kernel modname=kernel maindir=$(MAINDIR) \
-  arch=pc files="$(FILES) $(FUNCS)" asmfiles=$(ASMFILES) usesdks="private"
+  arch=pc files="$(FILES) $(FUNCS)" asmfiles=$(ASMFILES) usesdks="private config"

 %common
--- a/arch/all-pc/processor/mmakefile.src
+++ b/arch/all-pc/processor/mmakefile.src
@ -15,6 +15,6 @@ FILES := \
 #MM- kernel-processor-i386 : includes

 %build_archspecific mainmmake=kernel-processor modname=processor maindir=rom/processor \
-    arch=i386 files=$(FILES) usesdks="private"
+    arch=i386 files=$(FILES) usesdks="private config"

 %common
--- a/arch/all-pc/timer/mmakefile.src
+++ b/arch/all-pc/timer/mmakefile.src
@ -9,6 +9,6 @@ include $(SRCDIR)/$(CURDIR)/make.opts
 %build_archspecific \
  mainmmake=kernel-timer maindir=rom/timer \
  arch=pc modname=timer \
-  files="timer_init beginio ticks" usesdks="private"
+  files="timer_init beginio ticks" usesdks="private config"

 %common
--- a/arch/all-unix/kernel/mmakefile.src
+++ b/arch/all-unix/kernel/mmakefile.src
@ -18,7 +18,7 @@ SUPPORTFILES := kernel_cpusupport

 %build_archspecific \
  mainmmake=kernel-kernel maindir=rom/kernel \
-  arch=unix-support files="$(SUPPORTFILES)" modname=kernel usesdks="private"
+  arch=unix-support files="$(SUPPORTFILES)" modname=kernel usesdks="private config"

 #MM kernel-kernel-unix : kernel-kernel-unix-support

@ -27,7 +27,7 @@ USER_INCLUDES += -I$(GENDIR)/$(MAINDIR)/include \

 %build_archspecific \
  mainmmake=kernel-kernel maindir=rom/kernel \
-  arch=unix files="$(FILES) $(FUNCS)" modname=kernel usesdks="private"
+  arch=unix files="$(FILES) $(FUNCS)" modname=kernel usesdks="private config"

 TESTS		:= coretest

--- a/arch/i386-pc/drivers/serial.hidd/mmakefile.src
+++ b/arch/i386-pc/drivers/serial.hidd/mmakefile.src
@ -7,5 +7,5 @@ FILES	:=	serial_init SerialClass SerialUnitClass
 %build_module mmake=kernel-pc-i386-serial \
  modname=serial modtype=hidd \
  files=$(FILES) \
-  uselibs="hiddstubs oop" usesdks="private"
+  uselibs="hiddstubs oop" usesdks="private config"
  
--- a/arch/m68k-all/debug/mmakefile.src
+++ b/arch/m68k-all/debug/mmakefile.src
@ -8,6 +8,6 @@ USER_INCLUDES += -I$(SRCDIR)/rom/debug

 %build_archspecific \
  mainmmake=kernel-debug modname=debug maindir=rom/debug arch=m68k \
-  files="$(FILES)"
+  files="$(FILES)" usesdks="config"

 %common
--- a/arch/m68k-all/exec/mmakefile.src
+++ b/arch/m68k-all/exec/mmakefile.src
@ -30,7 +30,7 @@ TARGET_ISA_AFLAGS:=$(ISA_MC68060_FLAGS)
  mainmmake=kernel-exec modname=exec maindir=rom/exec \
  asmfiles="$(AFILES)" \
  files="$(FILES)" \
-  arch=m68k usesdks="private"
+  arch=m68k usesdks="private config"

 #MM kernel-exec-m68k : includes-asm_h-m68k

--- a/arch/m68k-amiga/exec/mmakefile.src
+++ b/arch/m68k-amiga/exec/mmakefile.src
@ -17,6 +17,6 @@ OPTIMIZATION_CFLAGS := -Os

 %build_archspecific \
  mainmmake=kernel-exec maindir=rom/exec arch=amiga-m68k \
-  files=$(CFILES) asmfiles=$(AFILES) modname=exec usesdks="private"
+  files=$(CFILES) asmfiles=$(AFILES) modname=exec usesdks="private config"

 TARGETDIR = $(BD_OBJDIR$(BDID))
--- a/arch/x86_64-all/exec/mmakefile.src
+++ b/arch/x86_64-all/exec/mmakefile.src
@ -9,7 +9,7 @@ USER_INCLUDES := $(PRIV_EXEC_INCLUDES)
  mainmmake=kernel-exec maindir=rom/exec \
  asmfiles="execstubs stackswap taskexit" \
  files="copymem newstackswap preparecontext alert_cpu" \
-  arch=x86_64 modname=exec usesdks="private"
+  arch=x86_64 modname=exec usesdks="private config"

 #MM kernel-exec-x86_64 : includes-asm_h-x86_64 kernel-kernel-includes

--- a/arch/x86_64-pc/kernel/mmakefile.src
+++ b/arch/x86_64-pc/kernel/mmakefile.src
@ -26,7 +26,7 @@ USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) -I$(SRCDIR)/arch/all-native/kernel \

 %build_archspecific \
  mainmmake=kernel-kernel maindir=$(MAINDIR) \
-  arch=pc-x86_64 files="$(FILES) $(FUNCS)" asmfiles=$(ASMFILES) modname=kernel usesdks="private"
+  arch=pc-x86_64 files="$(FILES) $(FUNCS)" asmfiles=$(ASMFILES) modname=kernel usesdks="private config"

 # This builds SMP bootstrap code

--- a/compiler/arossupport/mmakefile.src
+++ b/compiler/arossupport/mmakefile.src
@ -48,7 +48,7 @@ FMTPRINTFDIR := $(SRCDIR)/compiler/fmtprintf
 USER_INCLUDES := -I$(SRCDIR)/rom/exec -iquote $(FMTPRINTFDIR)
 USER_CFLAGS := $(CFLAGS_NO_BUILTIN)

-%build_linklib mmake=linklibs-arossupport libname=arossupport files=$(FILES)
+%build_linklib mmake=linklibs-arossupport libname=arossupport files=$(FILES) usesdks="config"

 INCLUDE_FILES	    := $(call WILDCARD, include/*.h)
 %copy_includes mmake=compiler-includes path=aros dir=include
--- a/compiler/include/exec/ports.h
+++ b/compiler/include/exec/ports.h
@ -9,8 +9,6 @@
    Lang: english
 */

-#include <aros/config.h>
-
 #ifndef EXEC_NODES_H
 #   include "exec/nodes.h"
 #endif
--- a/compiler/include/exec/semaphores.h
+++ b/compiler/include/exec/semaphores.h
@ -9,8 +9,6 @@
    Lang: english
 */

-#include <aros/config.h>
-
 #ifndef EXEC_LISTS_H
 #    include <exec/lists.h>
 #endif
--- a/compiler/include/mmakefile
+++ b/compiler/include/mmakefile
@ -135,7 +135,7 @@ endif

 $(OBJDIR)/asm.s : $(SRCDIR)/$(CURDIR)/asm.c | $(OBJDIR)
 	@$(ECHO) "Compiling  $<..."
-	@$(TARGET_CC) $(TARGET_SYSROOT) $(CFLAGS) $(PRIV_EXEC_INCLUDES) $(PRIV_KERNEL_INCLUDES) -I$(AROS_PRIVATE_INCLUDES) -S $< -o $@
+	@$(TARGET_CC) $(TARGET_SYSROOT) $(CFLAGS) $(PRIV_EXEC_INCLUDES) $(PRIV_KERNEL_INCLUDES) -I$(AROS_PRIVATE_INCLUDES) -I$(AROS_CONFIG_INCLUDES) -S $< -o $@

 $(GENINCDIR)/aros/$(CPU)/asm.h : $(OBJDIR)/asm.s | $(GENINCDIR)/aros/$(AROS_TARGET_CPU)
 	@$(ECHO) Generating $@...
--- a/config/make.cfg.in
+++ b/config/make.cfg.in
@ -152,6 +152,9 @@ AROS_PRIVATE_LIB              := $(AROS_PRIVATE_DEVELOPMENT)/$(AROS_DIR_LIB)
 # Build SDK for relative link libraries
 AROS_REL_LIB                  := $(AROS_BUILD_SDKS)/rel/$(AROS_DIR_LIB)

+# Build SDK for config.h
+AROS_CONFIG_INCLUDES          := $(AROS_BUILD_SDKS)/config/$(AROS_DIR_INCLUDE)
+

 # The generated files all go under the GENDIR path
 SCRIPTDIR                     := $(GENDIR)/scripts
--- a/12
+++ b/12
@ -14828,7 +14828,7 @@ aros_kernel_ar="$aros_kernel_ar $aros_kernel_ar_flags"

 aros_hostcfg_dir="bin/${aros_host_arch}-${aros_host_cpu}/gen/host/config"
 aros_targetcfg_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/config"
-aros_inc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/AROS/Development/include/aros"
+aros_cnfginc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/buildsdks/config/include/aros"
 aros_gendir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen"
 aros_geninc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/include/aros"
 aros_tools_dir="bin/${aros_host_arch}-${aros_host_cpu}/tools"
@ -16184,8 +16184,8 @@ aros_kernel_ranlib=$aros_kernel_ranlib



-# Target Related #########################

+# Target Related #########################



@ -16385,8 +16385,8 @@ ppcnative)      aros_flavour_uc="(AROS_FLAVOUR_STANDALONE|AROS_FLAVOUR_BINCOMPAT
                aros_flavour="ppcnative" ;;
 esac

-if test ! -d ${aros_inc_dir} ; then
-    ${MKDIR} ${aros_inc_dir}
+if test ! -d ${aros_cnfginc_dir} ; then
+    ${MKDIR} ${aros_cnfginc_dir}
 fi
 if test ! -d ${aros_geninc_dir} ; then
    ${MKDIR} ${aros_geninc_dir}
@ -16410,7 +16410,7 @@ ac_config_headers="$ac_config_headers ${aros_geninc_dir}/host-conf.h:config/host
 # Generic build tools (metamake, etc)
 ac_config_commands="$ac_config_commands genmf-executable-support"

-ac_config_files="$ac_config_files Makefile config/make.cfg ${aros_inc_dir}/config.h:config/config.h.in ${aros_geninc_dir}/config.h:config/config.h.in ${aros_hostcfg_dir}/host.cfg:config/host.cfg.in ${aros_targetcfg_dir}/target.cfg:config/target.cfg.in ${aros_targetcfg_dir}/build.cfg:config/build.cfg.in mmake.config compiler/include/geninc.cfg:compiler/include/geninc.cfg.in ${aros_targetcfg_dir}/make.defaults:config/make.defaults.in ${aros_tools_dir}/genmf.py:tools/genmf/genmf.py ${AROS_CROSSTOOLSDIR}/${aros_target_cpu}-aros-uname:scripts/uname.in tools/collect-aros/env.h"
+ac_config_files="$ac_config_files Makefile config/make.cfg ${aros_cnfginc_dir}/config.h:config/config.h.in ${aros_geninc_dir}/config.h:config/config.h.in ${aros_hostcfg_dir}/host.cfg:config/host.cfg.in ${aros_targetcfg_dir}/target.cfg:config/target.cfg.in ${aros_targetcfg_dir}/build.cfg:config/build.cfg.in mmake.config compiler/include/geninc.cfg:compiler/include/geninc.cfg.in ${aros_targetcfg_dir}/make.defaults:config/make.defaults.in ${aros_tools_dir}/genmf.py:tools/genmf/genmf.py ${AROS_CROSSTOOLSDIR}/${aros_target_cpu}-aros-uname:scripts/uname.in tools/collect-aros/env.h"


 # Binutils
@ -17185,7 +17185,7 @@ do
    "genmf-executable-support") CONFIG_COMMANDS="$CONFIG_COMMANDS genmf-executable-support" ;;
    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "config/make.cfg") CONFIG_FILES="$CONFIG_FILES config/make.cfg" ;;
-    "${aros_inc_dir}/config.h") CONFIG_FILES="$CONFIG_FILES ${aros_inc_dir}/config.h:config/config.h.in" ;;
+    "${aros_cnfginc_dir}/config.h") CONFIG_FILES="$CONFIG_FILES ${aros_cnfginc_dir}/config.h:config/config.h.in" ;;
    "${aros_geninc_dir}/config.h") CONFIG_FILES="$CONFIG_FILES ${aros_geninc_dir}/config.h:config/config.h.in" ;;
    "${aros_hostcfg_dir}/host.cfg") CONFIG_FILES="$CONFIG_FILES ${aros_hostcfg_dir}/host.cfg:config/host.cfg.in" ;;
    "${aros_targetcfg_dir}/target.cfg") CONFIG_FILES="$CONFIG_FILES ${aros_targetcfg_dir}/target.cfg:config/target.cfg.in" ;;
--- a/configure.in
+++ b/configure.in
@ -2661,7 +2661,7 @@ aros_kernel_ar="$aros_kernel_ar $aros_kernel_ar_flags"

 aros_hostcfg_dir="bin/${aros_host_arch}-${aros_host_cpu}/gen/host/config"
 aros_targetcfg_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/config"
-aros_inc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/AROS/Development/include/aros"
+aros_cnfginc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/buildsdks/config/include/aros"
 aros_gendir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen"
 aros_geninc_dir="bin/${aros_target_arch}-${aros_target_cpu}${aros_target_suffix}/gen/include/aros"
 aros_tools_dir="bin/${aros_host_arch}-${aros_host_cpu}/tools"
@ -3534,8 +3534,8 @@ ppcnative)      aros_flavour_uc="(AROS_FLAVOUR_STANDALONE|AROS_FLAVOUR_BINCOMPAT
                aros_flavour="ppcnative" ;;
 esac

-if test ! -d ${aros_inc_dir} ; then
-    ${MKDIR} ${aros_inc_dir}
+if test ! -d ${aros_cnfginc_dir} ; then
+    ${MKDIR} ${aros_cnfginc_dir}
 fi
 if test ! -d ${aros_geninc_dir} ; then
    ${MKDIR} ${aros_geninc_dir}
@ -3569,7 +3569,7 @@ AC_CONFIG_COMMANDS([genmf-executable-support],
 AC_CONFIG_FILES(
    Makefile
    config/make.cfg
-    ${aros_inc_dir}/config.h:config/config.h.in
+    ${aros_cnfginc_dir}/config.h:config/config.h.in
    ${aros_geninc_dir}/config.h:config/config.h.in
    ${aros_hostcfg_dir}/host.cfg:config/host.cfg.in
    ${aros_targetcfg_dir}/target.cfg:config/target.cfg.in
--- a/developer/debug/test/exec/mmakefile.src
+++ b/developer/debug/test/exec/mmakefile.src
@ -57,6 +57,6 @@ EXECPRIVATEFILES :=		\
 USER_INCLUDES += $(PRIV_EXEC_INCLUDES)

 %build_progs mmake=test-exec-private \
-    files=$(EXECPRIVATEFILES) targetdir=$(EXEDIR) usesdks="private"
+    files=$(EXECPRIVATEFILES) targetdir=$(EXEDIR) usesdks="private config"
    
 %common
--- a/developer/debug/test/exec/tasktest2.c
+++ b/developer/debug/test/exec/tasktest2.c
@ -3,6 +3,7 @@
    $Id$
 */

+#include <aros/config.h>
 #include <proto/exec.h>
 #include <exec/execbase.h>
 #include <exec/memory.h>
--- a/rom/alerthook/mmakefile.src
+++ b/rom/alerthook/mmakefile.src
@ -2,7 +2,7 @@

 include $(SRCDIR)/config/aros.cfg

-USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""
+USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" -I$(AROS_CONFIG_INCLUDES)

 #MM- kernel-alerthook : includes linklibs kernel-bootloader-includes

--- a/rom/aros/mmakefile.src
+++ b/rom/aros/mmakefile.src
@ -19,7 +19,7 @@ USER_CPPFLAGS := \

 %build_module mmake=kernel-aros \
  modname=aros modtype=library \
-  files="aros_init arosinquirea" usesdks="private"
+  files="aros_init arosinquirea" usesdks="private config"

 #MM
 kernel-aros-create-abi-file :
--- a/rom/debug/mmakefile.src
+++ b/rom/debug/mmakefile.src
@ -13,6 +13,6 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-debug \
  modname=debug modtype=library \
-  files="$(FILES) $(FUNCS)" linklibfiles=$(STATICFUNCS) usesdks="private"
+  files="$(FILES) $(FUNCS)" linklibfiles=$(STATICFUNCS) usesdks="private config"

 %common
--- a/rom/dos/mmakefile.src
+++ b/rom/dos/mmakefile.src
@ -83,7 +83,7 @@ USER_CPPFLAGS := $(DOS_CPPFLAGS)

 %build_module mmake=kernel-dos \
  modname=dos modtype=library \
-  files="dos_init $(FUNCTIONS) $(FILES) $(LOADSEG_FILES)" uselibs="romhack"
+  files="dos_init $(FUNCTIONS) $(FILES) $(LOADSEG_FILES)" uselibs="romhack" usesdks="config"

 $(GENDIR)/$(CURDIR)/dos/errorlist.d : $(GENDIR)/$(CURDIR)/dos/errorlist.h

--- a/rom/dosboot/mmakefile.src
+++ b/rom/dosboot/mmakefile.src
@ -16,7 +16,7 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-dosboot \
  modname=dosboot modtype=resource \
-  files="$(FILES)" uselibs="hiddstubs" usesdks="private"
+  files="$(FILES)" uselibs="hiddstubs" usesdks="private config"

 $(GENDIR)/$(CURDIR)/dosboot/bootanim.d : $(GENDIR)/$(CURDIR)/dosboot/nomedia_image.h

--- a/rom/exec/exception.c
+++ b/rom/exec/exception.c
@ -5,6 +5,7 @@
    Desc: Exception - Perform a task exception.
    Lang: english
 */
+#include <aros/config.h>
 #include <exec/execbase.h>
 #include <aros/asmcall.h>
 #include <exec_platform.h>
--- a/rom/exec/exec_intern.h
+++ b/rom/exec/exec_intern.h
@ -9,7 +9,7 @@
 #define __EXEC_INTERN_H__

 /* This is a short file that contains a few things every Exec function needs */
-
+#include <aros/config.h>
 #include <aros/debug.h> /* Needed for aros_print_not_implemented macro */
 #include <aros/system.h>
 #include <aros/libcall.h>
--- a/rom/exec/intserver_vblank.c
+++ b/rom/exec/intserver_vblank.c
@ -4,6 +4,7 @@
 */

 #define DEBUG 0
+#include <aros/config.h>
 #include <aros/debug.h>

 #include <aros/asmcall.h>
--- a/rom/exec/mmakefile.src
+++ b/rom/exec/mmakefile.src
@ -59,6 +59,6 @@ RESIDENT_BEGIN := $(KICKSTART_BEGIN)
 %build_module mmake=kernel-exec \
  modname=exec modtype=library version=$(AROS_TARGET_PLATFORM) archspecific=yes \
  linklibfiles=exec_autoinit files="$(INIT_FILES) $(ALL_FUNCTIONS) $(FILES)" \
-  usesdks="private"
+  usesdks="private config"

 %common
--- a/rom/expansion/mmakefile.src
+++ b/rom/expansion/mmakefile.src
@ -32,5 +32,5 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-expansion \
  modname=expansion modtype=library version=$(VERSION) \
-  files="expansion_init $(FUNCS)" archspecific=yes
+  files="expansion_init $(FUNCS)" archspecific=yes usesdks="config"

--- a/rom/filesys/ram/mmakefile.src
+++ b/rom/filesys/ram/mmakefile.src
@ -6,7 +6,7 @@ USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module mmake=kernel-fs-ram \
    modname=ram modtype=handler \
-    files="$(FILES)"
+    files="$(FILES)" usesdks="config"


 %common
--- a/rom/graphics/mmakefile.src
+++ b/rom/graphics/mmakefile.src
@ -224,4 +224,4 @@ FUNCTIONS := \

 %build_module mmake=kernel-graphics \
  modname=graphics modtype=library \
-  files="graphics_init $(FUNCTIONS) $(FILES)" usesdks="private rel"
+  files="graphics_init $(FUNCTIONS) $(FILES)" usesdks="private rel config"
--- a/rom/hidds/gfx/mmakefile.src
+++ b/rom/hidds/gfx/mmakefile.src
@ -31,7 +31,7 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-hidd-gfx \
  modname=gfx modtype=hidd \
-  files="$(FILES) $(COLORCONVFILES)" sdk=private usesdks="private"
+  files="$(FILES) $(COLORCONVFILES)" sdk=private usesdks="private config"

 LIBNAME     := gfx

--- a/rom/hyperlayers/mmakefile.src
+++ b/rom/hyperlayers/mmakefile.src
@ -66,4 +66,4 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-layers \
  modname=layers modtype=library \
-  files="layers_init $(FUNCS) $(FILES)"
+  files="layers_init $(FUNCS) $(FILES)" usesdks="config"
--- a/rom/intuition/mmakefile.src
+++ b/rom/intuition/mmakefile.src
@ -190,7 +190,7 @@ USER_CPPFLAGS := \

 %build_module mmake=kernel-intuition \
  modname=intuition modtype=library \
-  files="intuition_init $(FUNCS) $(FILES)" usesdks="private"
+  files="intuition_init $(FUNCS) $(FILES)" usesdks="private config"

 $(INTUITION_BUILDDIR)/shutdownscreen.d : $(INTUITION_BUILDDIR)/shutdown_image.h

--- a/rom/kernel/kernel_intr.h
+++ b/rom/kernel/kernel_intr.h
@ -8,6 +8,7 @@
    Desc:
 */

+#include <aros/config.h>
 #include <proto/exec.h>

 #include "exec_platform.h"
--- a/rom/kernel/kernel_scheduler.c
+++ b/rom/kernel/kernel_scheduler.c
@ -5,6 +5,7 @@
    Desc:
 */

+#include <aros/config.h>
 #include <exec/alerts.h>
 #include <exec/execbase.h>
 #include <proto/exec.h>
--- a/rom/kernel/mmakefile.src
+++ b/rom/kernel/mmakefile.src
@ -45,7 +45,7 @@ endif

 %build_module mmake=kernel-kernel \
  modname=kernel modtype=resource version=$(AROS_TARGET_PLATFORM) \
-  files="$(FILES) $(FUNCS)" nostartup=no archspecific=yes sdk=private usesdks="private"
+  files="$(FILES) $(FUNCS)" nostartup=no archspecific=yes sdk=private usesdks="private config"

 #
 # use genmodule to generate the clocksource resource API headers
--- a/rom/lddemon/mmakefile.src
+++ b/rom/lddemon/mmakefile.src
@ -11,6 +11,6 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-lddemon \
  modname=lddemon modtype=resource \
-  files="lddemon" sdk="private"
+  files="lddemon" sdk=private usesdks="config"

-%copy_includes dir=include path=resources sdk="private"
+%copy_includes dir=include path=resources sdk=private
--- a/rom/task/mmakefile.src
+++ b/rom/task/mmakefile.src
@ -26,6 +26,6 @@ TASKRES_FILES :=		\
 	    $(TASKRES_FUNCS)

 %build_module mmake=kernel-task modname=task modtype=resource \
-    files="$(TASKRES_FILES)" sdk="private" usesdks="private"
+    files="$(TASKRES_FILES)" sdk="private" usesdks="private config"

 %copy_includes path=resources sdk="private"
--- a/rom/timer/mmakefile.src
+++ b/rom/timer/mmakefile.src
@ -29,6 +29,6 @@ USER_LDFLAGS := -static

 %build_module mmake=kernel-timer \
  modname=timer modtype=device version=$(AROS_TARGET_PLATFORM) \
-  files="$(FUNCS) $(FILES)" archspecific=yes
+  files="$(FUNCS) $(FILES)" archspecific=yes usesdks="config"

 %common
--- a/workbench/network/common/C/mmakefile.src
+++ b/workbench/network/common/C/mmakefile.src
@ -12,7 +12,7 @@ USER_CPPFLAGS := -D_XOPEN_SOURCE=600 -D__BSD_VISIBLE=1

 %build_progs mmake=workbench-network-common-c \
    files="ifconfig route ping resolve arp logger hostname" \
-    targetdir=$(AROS_C)
+    targetdir=$(AROS_C) usesdks="config"

 #%common

--- a/workbench/system/Snoopy/mmakefile.src
+++ b/workbench/system/Snoopy/mmakefile.src
@ -13,6 +13,6 @@ EXEDIR  := $(AROS_SYSTEM)

 %build_prog mmake=workbench-system-snoopy \
    progname=Snoopy targetdir=$(EXEDIR) \
-    files=$(FILES)
+    files=$(FILES) usesdks="config"

 %common
--- a/workbench/system/SysMon/mmakefile.src
+++ b/workbench/system/SysMon/mmakefile.src
@ -15,6 +15,6 @@ USER_CFLAGS :=

 %build_prog mmake=workbench-system-sysmon \
    files=$(FILES) targetdir=$(EXEDIR) \
-    progname=SysMon usesdks="private"
+    progname=SysMon usesdks="private config"

 %common