From 917735c22d3e1fa0c087b53fca04ea46c5b7b922 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 26 Apr 2017 21:59:28 +0000
Subject: [PATCH] generate the include .cfg file and rebuild it when necessary.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54603 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 Makefile.in  | 8 ++++----
 configure    | 4 ++--
 configure.in | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 24c2217249..71316a13d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,10 +35,10 @@ ifneq (,$(findstring s,$(MAKEFLAGS)))
 MMAKE_OPTIONS += -q
 endif
 
-$(TOP)/compiler/include/mmakefile: $(SRCDIR)/compiler/include/mmakefile.in $(TOP)/config.status $(SRCDIR)/compiler/include/mmakefile.src $(SRCDIR)/config/make.tmpl 
+$(TOP)/compiler/include/geninc.cfg: $(SRCDIR)/compiler/include/geninc.cfg.in $(TOP)/config.status
 	@$(TOP)/config.status --file=$@:$<
 
-all: $(TOP)/compiler/include/mmakefile crosstools features
+all: $(TOP)/compiler/include/geninc.cfg crosstools features
 	@+$(CALL) $(MMAKE) $(MMAKE_OPTIONS) AROS.AROS
 
 makedirs:
@@ -202,7 +202,7 @@ $(TOP)/bin/$(AROS_TARGET_ARCH)-$(AROS_TARGET_CPU)$(AROS_TARGET_SUFFIX)/gen/confi
 	test kernel boot workbench compiler contrib ports sdk mmake query
 
 # Workaround for bug in make v3.81 (should normally be handled by .DEFAULT)
-install test kernel boot workbench compiler contrib ports sdk : crosstools features $(TOP)/compiler/include/mmakefile
+install test kernel boot workbench compiler contrib ports sdk : crosstools features $(TOP)/compiler/include/geninc.cfg
 	@+$(CALL) $(MMAKE) $(MMAKE_OPTIONS) AROS.$@
 
 # Bypass crosstools target.
@@ -223,7 +223,7 @@ distfiles::
 %-quick %-clean: 
 	@+$(CALL) $(MMAKE) $(MMAKE_OPTIONS) AROS.$@
 
-.DEFAULT: $(TOP)/compiler/include/mmakefile
+.DEFAULT: $(TOP)/compiler/include/geninc.cfg
 	@$(MAKE) $(MKARGS) crosstools
 	@$(MAKE) $(MKARGS) crosstools features
 	@+$(CALL) $(MMAKE) $(MMAKE_OPTIONS) AROS.$@
diff --git a/configure b/configure
index 62fa23d4d8..421a4f228c 100755
--- a/configure
+++ b/configure
@@ -15120,7 +15120,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/mmakefile:compiler/include/mmakefile.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_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"
 
 
 # Binutils
@@ -15901,7 +15901,7 @@ do
     "${aros_targetcfg_dir}/target.cfg") CONFIG_FILES="$CONFIG_FILES ${aros_targetcfg_dir}/target.cfg:config/target.cfg.in" ;;
     "${aros_targetcfg_dir}/build.cfg") CONFIG_FILES="$CONFIG_FILES ${aros_targetcfg_dir}/build.cfg:config/build.cfg.in" ;;
     "mmake.config") CONFIG_FILES="$CONFIG_FILES mmake.config" ;;
-    "compiler/include/mmakefile") CONFIG_FILES="$CONFIG_FILES compiler/include/mmakefile:compiler/include/mmakefile.in" ;;
+    "compiler/include/geninc.cfg") CONFIG_FILES="$CONFIG_FILES compiler/include/geninc.cfg:compiler/include/geninc.cfg.in" ;;
     "${aros_targetcfg_dir}/make.defaults") CONFIG_FILES="$CONFIG_FILES ${aros_targetcfg_dir}/make.defaults:config/make.defaults.in" ;;
     "${aros_tools_dir}/genmf.py") CONFIG_FILES="$CONFIG_FILES ${aros_tools_dir}/genmf.py:tools/genmf/genmf.py" ;;
     "${AROS_CROSSTOOLSDIR}/${aros_target_cpu}-aros-uname") CONFIG_FILES="$CONFIG_FILES ${AROS_CROSSTOOLSDIR}/${aros_target_cpu}-aros-uname:scripts/uname.in" ;;
diff --git a/configure.in b/configure.in
index 96a8b35da7..b836043912 100644
--- a/configure.in
+++ b/configure.in
@@ -3074,7 +3074,7 @@ AC_CONFIG_FILES(
     ${aros_targetcfg_dir}/target.cfg:config/target.cfg.in
     ${aros_targetcfg_dir}/build.cfg:config/build.cfg.in
     mmake.config
-    compiler/include/mmakefile:compiler/include/mmakefile.in
+    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
-- 
2.11.4.GIT