From bd1bdf4d6888b7a18c8ef2a35a61d35bebadd6e2 Mon Sep 17 00:00:00 2001 From: NicJA Date: Mon, 28 Mar 2016 11:18:43 +0000 Subject: [PATCH] $(TOP)/config/make.cfg -> $(SRCDIR)/config/aros.cfg git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@52304 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- mmakefile | 2 +- tools/MetaMake/mmakefile.src | 2 +- tools/adflib/mmakefile.src | 2 +- tools/archtools/mmakefile.src | 2 +- tools/crosstools/mmakefile.src | 2 +- tools/dtdesc/c_iff/mmakefile.src | 2 +- tools/dtdesc/mmakefile.src | 2 +- tools/elf2hunk/mmakefile.src | 2 +- tools/fd2pragma/mmakefile.src | 3 +-- tools/flexcat/mmakefile.src | 2 +- tools/flexcat/src/mmakefile.src | 3 +-- tools/genmf/mmakefile.src | 2 +- tools/ilbmtoc/mmakefile.src | 3 +-- tools/ilbmtoicon/mmakefile.src | 2 +- tools/sdk/mmakefile.src | 2 +- tools/setrev/mmakefile.src | 2 +- tools/toollib/mmakefile.src | 2 +- 17 files changed, 17 insertions(+), 20 deletions(-) diff --git a/mmakefile b/mmakefile index 171c246cda..92a856b6fb 100644 --- a/mmakefile +++ b/mmakefile @@ -1,7 +1,7 @@ # Copyright © 1995-2012, The AROS Development Team. All rights reserved. # $Id$ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM AROS : clean-errors AROS-$(ARCH)-$(CPU)-$(AROS_TARGET_VARIANT) AROS-$(ARCH)-$(CPU) test AROS : checkerr diff --git a/tools/MetaMake/mmakefile.src b/tools/MetaMake/mmakefile.src index 23a71b908b..c191f96b65 100644 --- a/tools/MetaMake/mmakefile.src +++ b/tools/MetaMake/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg ##MM- build-tools : build-tools-mmake diff --git a/tools/adflib/mmakefile.src b/tools/adflib/mmakefile.src index 89255a442a..b1cca4a9e4 100644 --- a/tools/adflib/mmakefile.src +++ b/tools/adflib/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- linklibs : linklibs-adf diff --git a/tools/archtools/mmakefile.src b/tools/archtools/mmakefile.src index d2a5eca107..6a96686927 100644 --- a/tools/archtools/mmakefile.src +++ b/tools/archtools/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-archtool #MM tools-archtool : includes linklibs diff --git a/tools/crosstools/mmakefile.src b/tools/crosstools/mmakefile.src index 7ee99b74cd..3c2c691f56 100644 --- a/tools/crosstools/mmakefile.src +++ b/tools/crosstools/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg LN ?= ln diff --git a/tools/dtdesc/c_iff/mmakefile.src b/tools/dtdesc/c_iff/mmakefile.src index e4ff39e309..12b0d437a1 100644 --- a/tools/dtdesc/c_iff/mmakefile.src +++ b/tools/dtdesc/c_iff/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg CFLAGS := $(subst -O2,,$(CFLAGS)) diff --git a/tools/dtdesc/mmakefile.src b/tools/dtdesc/mmakefile.src index 2ccf333e9d..0e348964cc 100644 --- a/tools/dtdesc/mmakefile.src +++ b/tools/dtdesc/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-dtdesc #MM tools-dtdesc : includes linklibs diff --git a/tools/elf2hunk/mmakefile.src b/tools/elf2hunk/mmakefile.src index 105711a8c1..c1239a716d 100644 --- a/tools/elf2hunk/mmakefile.src +++ b/tools/elf2hunk/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- build-tools : build-tools-elf2hunk diff --git a/tools/fd2pragma/mmakefile.src b/tools/fd2pragma/mmakefile.src index 3360cfef12..c3d95b29bd 100644 --- a/tools/fd2pragma/mmakefile.src +++ b/tools/fd2pragma/mmakefile.src @@ -1,5 +1,4 @@ -include $(TOP)/config/make.cfg --include $(GENDIR)/config/compiler.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-fd2pragma #MM tools-fd2pragma : includes linklibs diff --git a/tools/flexcat/mmakefile.src b/tools/flexcat/mmakefile.src index 9ffff3aebe..533d8ef140 100644 --- a/tools/flexcat/mmakefile.src +++ b/tools/flexcat/mmakefile.src @@ -1,6 +1,6 @@ # $Id$ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-flexcat #MM- tools-flexcat : tools-flexcat-doc tools-flexcat-cpy diff --git a/tools/flexcat/src/mmakefile.src b/tools/flexcat/src/mmakefile.src index b1ad1512e3..7630c9eb7c 100644 --- a/tools/flexcat/src/mmakefile.src +++ b/tools/flexcat/src/mmakefile.src @@ -1,7 +1,6 @@ # $Id$ -include $(TOP)/config/make.cfg --include $(GENDIR)/config/compiler.cfg +include $(SRCDIR)/config/aros.cfg #MM- tools-flexcat : tools-flexcat-bin tools-flexcat-sd tools-flexcat-locale #MM tools-flexcat-bin : includes linklibs diff --git a/tools/genmf/mmakefile.src b/tools/genmf/mmakefile.src index 02ae92af55..66c56c6df0 100644 --- a/tools/genmf/mmakefile.src +++ b/tools/genmf/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-genmf #MM tools-genmf : includes linklibs diff --git a/tools/ilbmtoc/mmakefile.src b/tools/ilbmtoc/mmakefile.src index 110452af30..d3d4b2d344 100644 --- a/tools/ilbmtoc/mmakefile.src +++ b/tools/ilbmtoc/mmakefile.src @@ -1,5 +1,4 @@ -include $(TOP)/config/make.cfg --include $(GENDIR)/config/compiler.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-ilbmtoc #MM tools-ilbmtoc : includes linklibs diff --git a/tools/ilbmtoicon/mmakefile.src b/tools/ilbmtoicon/mmakefile.src index 20a631d672..d52b6937f4 100644 --- a/tools/ilbmtoicon/mmakefile.src +++ b/tools/ilbmtoicon/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-ilbmtoicon #MM tools-ilbmtoicon : includes linklibs tools-ilbmtoicon-docs diff --git a/tools/sdk/mmakefile.src b/tools/sdk/mmakefile.src index ae2b263aee..cc0c946012 100644 --- a/tools/sdk/mmakefile.src +++ b/tools/sdk/mmakefile.src @@ -1,7 +1,7 @@ # Copyright © 2010, The AROS Development Team. All rights reserved. # $Id$ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg SDKDIR := $(AROSDIR)/../AROS-SDK SDKINCDIR := $(AROSDIR)/../AROS-SDK/$(AROS_TARGET_CPU)/include diff --git a/tools/setrev/mmakefile.src b/tools/setrev/mmakefile.src index 273396cbc4..0795bc5298 100644 --- a/tools/setrev/mmakefile.src +++ b/tools/setrev/mmakefile.src @@ -1,6 +1,6 @@ # $Id$ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg #MM- contrib-development : tools-setrev #MM tools-setrev : includes linklibs diff --git a/tools/toollib/mmakefile.src b/tools/toollib/mmakefile.src index e3662a3184..0d87bf2e49 100644 --- a/tools/toollib/mmakefile.src +++ b/tools/toollib/mmakefile.src @@ -1,4 +1,4 @@ -include $(TOP)/config/make.cfg +include $(SRCDIR)/config/aros.cfg HFILES := \ callback.h \