From 86532958b25618f2beecae054f1458d885eb279a Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Tue, 12 Jul 2011 15:13:49 +0000 Subject: [PATCH] build: Use core-linklibs everywhere. Some places had linklibs-core, others had core-linklibs. We'll choose to use core-linklibs, since that way if a 'core.library' was to be made in the future, it's linklibs-core target would not be confused with the system-generic core-linklibs target that builds all the autoinit and compiler linklibs. Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@40039 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- compiler/alib/mmakefile.src | 2 +- compiler/arossupport/mmakefile.src | 2 +- compiler/autoinit/mmakefile.src | 2 +- compiler/clib/mmakefile.src | 2 +- compiler/libbz2/mmakefile.src | 2 +- compiler/libinit/mmakefile.src | 2 +- compiler/libjpeg/mmakefile.src | 2 +- compiler/mlib/mmakefile.src | 2 +- compiler/startup/mmakefile.src | 2 +- compiler/zlib/mmakefile.src | 2 +- config/make.tmpl | 6 +++--- rom/graphics/mmakefile.src | 2 +- rom/hyperlayers/mmakefile.src | 2 +- rom/intuition/mmakefile.src | 2 +- rom/partition/mmakefile.src | 6 +++--- rom/utility/mmakefile.src | 2 +- tools/crosstools/mmakefile.src | 4 ++-- workbench/libs/asl/mmakefile.src | 2 +- workbench/libs/cgfx/mmakefile.src | 2 +- workbench/libs/commodities/mmakefile.src | 2 +- workbench/libs/datatypes/mmakefile.src | 2 +- workbench/libs/diskfont/mmakefile.src | 2 +- workbench/libs/gadtools/mmakefile.src | 2 +- workbench/libs/icon/mmakefile.src | 2 +- workbench/libs/iffparse/mmakefile.src | 2 +- workbench/libs/locale/mmakefile.src | 2 +- workbench/libs/muimaster/mmakefile.src | 2 +- workbench/libs/muimaster/staticlib/mmakefile.src | 2 +- workbench/libs/popupmenu/staticlib/mmakefile.src | 2 +- workbench/libs/workbench/mmakefile.src | 2 +- 30 files changed, 35 insertions(+), 35 deletions(-) diff --git a/compiler/alib/mmakefile.src b/compiler/alib/mmakefile.src index 8fe245198b..c7a9ef6acc 100644 --- a/compiler/alib/mmakefile.src +++ b/compiler/alib/mmakefile.src @@ -116,7 +116,7 @@ FILES := \ videocontroltags \ workbenchcontrol -#MM- linklibs-core : linklibs-amiga +#MM- core-linklibs : linklibs-amiga #MM- linklibs: linklibs-amiga #MM linklibs-amiga : includes includes-copy kernel-aros-includes diff --git a/compiler/arossupport/mmakefile.src b/compiler/arossupport/mmakefile.src index 110750ad3e..791cbeef36 100644 --- a/compiler/arossupport/mmakefile.src +++ b/compiler/arossupport/mmakefile.src @@ -41,7 +41,7 @@ FILES := \ writestruct \ writeword -#MM- linklibs-core : linklibs-arossupport +#MM- core-linklibs : linklibs-arossupport #MM- linklibs: linklibs-arossupport #MM linklibs-arossupport : includes diff --git a/compiler/autoinit/mmakefile.src b/compiler/autoinit/mmakefile.src index fb915d8d5d..9201aa81d9 100644 --- a/compiler/autoinit/mmakefile.src +++ b/compiler/autoinit/mmakefile.src @@ -28,7 +28,7 @@ MISCFILES := \ FILES := $(LIBBASEFILES) $(LIBHANDLINGFILES) $(STARTUPFILES) $(MISCFILES) -#MM- linklibs-core : linklibs-autoinit +#MM- core-linklibs : linklibs-autoinit #MM- linklibs: linklibs-autoinit #MM linklibs-autoinit : includes includes-copy kernel-expansion-includes diff --git a/compiler/clib/mmakefile.src b/compiler/clib/mmakefile.src index b2ec5cc418..c9f586765e 100644 --- a/compiler/clib/mmakefile.src +++ b/compiler/clib/mmakefile.src @@ -514,7 +514,7 @@ ROM_OBJ32 := $(foreach f,$(ROM_ONLY),$(OBJDIR32)/rom/$(f).o) \ LIBS := $(ARCH_LIBS) -L$(AROS_LIB) -larosm -lautoinit -larossupport DEP_LIBS := arosm autoinit arossupport -#MM- linklibs-core : linklibs-clib +#MM- core-linklibs : linklibs-clib #MM- linklibs : linklibs-clib #MM linklibs-clib : setup-clib includes linklibs-mlib linklibs-autoinit \ #MM clib-stubs linklibs-amiga linklibs-arossupport \ diff --git a/compiler/libbz2/mmakefile.src b/compiler/libbz2/mmakefile.src index 46128d1ef9..3ce6b34ad9 100644 --- a/compiler/libbz2/mmakefile.src +++ b/compiler/libbz2/mmakefile.src @@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg INCLUDE_FILES := bzlib.h -#MM- linklibs-core : linklibs-bz2 +#MM- core-linklibs : linklibs-bz2 #MM- linklibs : linklibs-bz2 #MM- linklibs-bz2 : includes #MM includes-copy diff --git a/compiler/libinit/mmakefile.src b/compiler/libinit/mmakefile.src index 182db26b43..3120e1d04c 100644 --- a/compiler/libinit/mmakefile.src +++ b/compiler/libinit/mmakefile.src @@ -4,7 +4,7 @@ # include $(TOP)/config/make.cfg -#MM- linklibs-core : linklibs-libinit +#MM- core-linklibs : linklibs-libinit #MM- linklibs: linklibs-libinit #MM linklibs-libinit : includes diff --git a/compiler/libjpeg/mmakefile.src b/compiler/libjpeg/mmakefile.src index 216d82889f..3aa2cd74b1 100644 --- a/compiler/libjpeg/mmakefile.src +++ b/compiler/libjpeg/mmakefile.src @@ -22,7 +22,7 @@ INCLUDE_FILES := jpeglib.h jversion.h jinclude.h jconfig.h jmorecfg.h jerror.h USER_CFLAGS := -DNO_GETENV -#MM- linklibs-core : linklibs-jpeg +#MM- core-linklibs : linklibs-jpeg #MM- linklibs: linklibs-jpeg #MM linklibs-jpeg : includes #MM includes-copy diff --git a/compiler/mlib/mmakefile.src b/compiler/mlib/mmakefile.src index c2935cb7f9..57dc6301a2 100644 --- a/compiler/mlib/mmakefile.src +++ b/compiler/mlib/mmakefile.src @@ -184,7 +184,7 @@ includes-copy : $(AROS_INCLUDES)/math.h %rule_copy from=$(SRCDIR)/$(CURDIR)/%.h to=$(AROS_INCLUDES)/%.h -#MM- linklibs-core : linklibs-mlib +#MM- core-linklibs : linklibs-mlib #MM- linklibs : linklibs-mlib #MM- linklibs-mlib : linklibs-arosm-$(CPU) arosm-setup-link #MM linklibs-arosm-hasfpu : includes diff --git a/compiler/startup/mmakefile.src b/compiler/startup/mmakefile.src index b1b0949671..221f1357cc 100644 --- a/compiler/startup/mmakefile.src +++ b/compiler/startup/mmakefile.src @@ -4,7 +4,7 @@ # include $(TOP)/config/make.cfg -#MM- linklibs-core : linklibs-startup +#MM- core-linklibs : linklibs-startup #MM- linklibs: linklibs-startup #MM linklibs-startup : linklibs-startup-setup includes includes-copy diff --git a/compiler/zlib/mmakefile.src b/compiler/zlib/mmakefile.src index 7b1d6f1523..f466bb65fe 100644 --- a/compiler/zlib/mmakefile.src +++ b/compiler/zlib/mmakefile.src @@ -22,7 +22,7 @@ FILES := \ zutil -#MM- linklibs-core : linklibs-zlib +#MM- core-linklibs : linklibs-zlib #MM- linklibs : linklibs-zlib #MM- linklibs-zlib : linklibs-arosz arosz-setup-link #MM linklibs-arosz : includes diff --git a/config/make.tmpl b/config/make.tmpl index 62ea4969cd..6dd7ff4087 100644 --- a/config/make.tmpl +++ b/config/make.tmpl @@ -945,7 +945,7 @@ BD_LDFLAGS := %(ldflags) #MM %(mmake)-quick : %(mmake) -#MM %(mmake) : includes-generate-deps linklibs-core linklibs-%(uselibs) +#MM %(mmake) : includes-generate-deps core-linklibs linklibs-%(uselibs) %(mmake) : $(BD_TARGETDIR)/$(BD_PROGNAME) ifneq ($(filter $(TARGET),%(mmake) %(mmake)-quick),) @@ -1003,7 +1003,7 @@ BD_LDFLAGS := %(ldflags) #MM %(mmake)-quick : %(mmake) -#MM %(mmake) : includes-generate-deps linklibs-core linklibs-%(uselibs) +#MM %(mmake) : includes-generate-deps core-linklibs linklibs-%(uselibs) %(mmake) : $(BD_EXES) ifneq ($(filter $(TARGET),%(mmake) %(mmake)-quick),) @@ -2199,7 +2199,7 @@ endif .PHONY : %(mmake) %(mmake)-clean %(mmake)-build_and_install-quick -#MM- %(mmake) : setup includes linklibs-core %(mmake)-quick +#MM- %(mmake) : setup includes core-linklibs %(mmake)-quick # Using -j1 in install_command may result in a warning but finally # it does its job. make install for gcc does not work reliably for -jN diff --git a/rom/graphics/mmakefile.src b/rom/graphics/mmakefile.src index b278e649bc..d5e8a9f1c4 100644 --- a/rom/graphics/mmakefile.src +++ b/rom/graphics/mmakefile.src @@ -221,7 +221,7 @@ FUNCTIONS := \ #MM workbench-libs-cgfx-includes \ #MM includes-copy -#MM- linklibs-core : linklibs-graphics +#MM- core-linklibs : linklibs-graphics %build_module mmake=kernel-graphics \ modname=graphics modtype=library \ diff --git a/rom/hyperlayers/mmakefile.src b/rom/hyperlayers/mmakefile.src index 38eb324e68..000310386a 100644 --- a/rom/hyperlayers/mmakefile.src +++ b/rom/hyperlayers/mmakefile.src @@ -54,7 +54,7 @@ FUNCS := \ #MM kernel-utility-includes \ #MM includes-copy -#MM- linklibs-core: linklibs-layers +#MM- core-linklibs: linklibs-layers USER_CFLAGS := -D__UTILITY_NOLIBBASE__ -D__GRAPHICS_NOLIBBASE__ diff --git a/rom/intuition/mmakefile.src b/rom/intuition/mmakefile.src index b6e895a6cc..99c31012d0 100644 --- a/rom/intuition/mmakefile.src +++ b/rom/intuition/mmakefile.src @@ -174,7 +174,7 @@ USER_INCLUDES := -I$(SRCDIR)/rom/dos \ #MM kernel-keymap-includes \ #MM kernel-input-includes \ #MM includes-copy -#MM- linklibs-core: linklibs-intuition +#MM- core-linklibs: linklibs-intuition %build_module mmake=kernel-intuition \ modname=intuition modtype=library \ diff --git a/rom/partition/mmakefile.src b/rom/partition/mmakefile.src index 362ff0da40..d2b2b601b8 100644 --- a/rom/partition/mmakefile.src +++ b/rom/partition/mmakefile.src @@ -35,9 +35,9 @@ FUNCS := \ #MM kernel-partition-includes : \ #MM kernel-exec-includes \ #MM includes-copy -#MM kernel-partition : linklibs-core core-linklibs -#MM kernel-partition-kobj : linklibs-core core-linklibs -#MM- linklibs-core: linklibs-partition +#MM kernel-partition : core-linklibs core-linklibs +#MM kernel-partition-kobj : core-linklibs core-linklibs +#MM- core-linklibs: linklibs-partition USER_CFLAGS := -DDEBUG=0 \ -D__UTILITY_NOLIBBASE__ diff --git a/rom/utility/mmakefile.src b/rom/utility/mmakefile.src index 41cadd56f1..0ad8b0b995 100644 --- a/rom/utility/mmakefile.src +++ b/rom/utility/mmakefile.src @@ -19,7 +19,7 @@ FUNCTIONS := \ #MM kernel-utility-includes : \ #MM kernel-exec-includes -#MM- linklibs-core : linklibs-utility +#MM- core-linklibs : linklibs-utility %build_module mmake=kernel-utility \ modname=utility modtype=library \ diff --git a/tools/crosstools/mmakefile.src b/tools/crosstools/mmakefile.src index 26fc1dac16..5a86d2ef17 100644 --- a/tools/crosstools/mmakefile.src +++ b/tools/crosstools/mmakefile.src @@ -32,12 +32,12 @@ gcc-installflag := $(CROSSTOOLSDIR)/.installflag-gcc-$(GCC_VERSION) #MM- tools-crosstools-x86_64 : tools-crosstools-gcc crosstools-gcc #MM- tools-crosstools-ppc : tools-crosstools-gcc crosstools-gcc # arm still needs linklibs be build before, can be removed after patch is updated to work with --with-sysroot -#MM- tools-crosstools-arm : linklibs-core tools-crosstools-gcc crosstools-gcc +#MM- tools-crosstools-arm : core-linklibs tools-crosstools-gcc crosstools-gcc #MM tools-crosstools-gcc : tools-crosstools-binutils tools-crosstools-collect-aros compiler-includes compiler-clib-includes # We intentionally bypass the usual fetch_and_build macro below and call mmakefile and gcc makefile -# targets directly. This is in order to not build the linklibs-core target during binutils and gcc +# targets directly. This is in order to not build the core-linklibs target during binutils and gcc # builds because we want these static linker libraries be generated by the cross tool chain we are building # right here. Additionally, we also want to maintain our own install flag files inside the directory # specified by --with-crosstools. This directory may even reside outside of the usual aros build directory diff --git a/workbench/libs/asl/mmakefile.src b/workbench/libs/asl/mmakefile.src index 8498ccd7e9..cb760ce0a6 100644 --- a/workbench/libs/asl/mmakefile.src +++ b/workbench/libs/asl/mmakefile.src @@ -41,7 +41,7 @@ FUNCS := allocfilerequest \ #MM workbench-libs-asl-catalogs \ #MM workbench-libs-coolimages -#MM- linklibs-core: linklibs-asl +#MM- core-linklibs: linklibs-asl %build_module mmake=workbench-libs-asl \ modname=asl modtype=library \ diff --git a/workbench/libs/cgfx/mmakefile.src b/workbench/libs/cgfx/mmakefile.src index f7104f2fe3..2800bc94ce 100644 --- a/workbench/libs/cgfx/mmakefile.src +++ b/workbench/libs/cgfx/mmakefile.src @@ -36,7 +36,7 @@ FUNCS := \ #MM- workbench-libs-cgfx-includes : \ #MM kernel-exec-includes \ #MM includes-copy -#MM- linklibs-core: linklibs-cybergraphics +#MM- core-linklibs: linklibs-cybergraphics %build_module mmake=workbench-libs-cgfx \ modname=cybergraphics modtype=library \ diff --git a/workbench/libs/commodities/mmakefile.src b/workbench/libs/commodities/mmakefile.src index 68b9ed5ffb..cc2c64ca9c 100644 --- a/workbench/libs/commodities/mmakefile.src +++ b/workbench/libs/commodities/mmakefile.src @@ -40,7 +40,7 @@ FUNCS := activatecxobj \ #MM kernel-utility-includes \ #MM includes-copy #MM- workbench-libs-commodities : linklibs -#MM- linklibs-core: linklibs-commodities +#MM- core-linklibs: linklibs-commodities %build_module mmake=workbench-libs-commodities \ modname=commodities modtype=library \ diff --git a/workbench/libs/datatypes/mmakefile.src b/workbench/libs/datatypes/mmakefile.src index e3ccc2df6d..0f4738cb42 100644 --- a/workbench/libs/datatypes/mmakefile.src +++ b/workbench/libs/datatypes/mmakefile.src @@ -47,7 +47,7 @@ FUNCS := adddtobject \ #MM workbench-libs-icon-includes \ #MM includes-copy -#MM- linklibs-core: linklibs-datatypes +#MM- core-linklibs: linklibs-datatypes %build_module mmake=workbench-libs-datatypes \ modname=datatypes modtype=library \ diff --git a/workbench/libs/diskfont/mmakefile.src b/workbench/libs/diskfont/mmakefile.src index c482171b42..d3b9e98dd8 100644 --- a/workbench/libs/diskfont/mmakefile.src +++ b/workbench/libs/diskfont/mmakefile.src @@ -17,7 +17,7 @@ FUNCS := opendiskfont \ #MM workbench-libs-bullet-includes \ #MM includes-copy #MM- workbench-libs-diskfont : linklibs -#MM- linklibs-core: linklibs-diskfont +#MM- core-linklibs: linklibs-diskfont %build_module mmake=workbench-libs-diskfont \ modname=diskfont modtype=library \ diff --git a/workbench/libs/gadtools/mmakefile.src b/workbench/libs/gadtools/mmakefile.src index 4bc44f263f..8064d5a2d9 100644 --- a/workbench/libs/gadtools/mmakefile.src +++ b/workbench/libs/gadtools/mmakefile.src @@ -35,7 +35,7 @@ FUNCS := createcontext \ #MM kernel-layers-includes \ #MM includes-copy #MM- workbench-libs-gadtools : linklibs -#MM- linklibs-core : linklibs-gadtools +#MM- core-linklibs : linklibs-gadtools USER_CFLAGS := -D__NOLIBBASE__ diff --git a/workbench/libs/icon/mmakefile.src b/workbench/libs/icon/mmakefile.src index 8c01c26344..53589cf49e 100644 --- a/workbench/libs/icon/mmakefile.src +++ b/workbench/libs/icon/mmakefile.src @@ -48,7 +48,7 @@ FUNCS := \ #MM workbench-libs-datatypes-includes \ #MM workbench-datatypes-png-includes \ #MM- workbench-libs-icon : linklibs -#MM- linklibs-core: linklibs-icon +#MM- core-linklibs: linklibs-icon USER_CFLAGS := -D__NOLIBBASE__ diff --git a/workbench/libs/iffparse/mmakefile.src b/workbench/libs/iffparse/mmakefile.src index f1c91e96ad..48a6b6054c 100644 --- a/workbench/libs/iffparse/mmakefile.src +++ b/workbench/libs/iffparse/mmakefile.src @@ -52,7 +52,7 @@ FUNCS := \ #MM kernel-utility-includes \ #MM includes-copy #MM- workbench-libs-iffparse : linklibs -#MM- linklibs-core: linklibs-iffparse +#MM- core-linklibs: linklibs-iffparse %build_module mmake=workbench-libs-iffparse \ modname=iffparse modtype=library \ diff --git a/workbench/libs/locale/mmakefile.src b/workbench/libs/locale/mmakefile.src index 0e35920f00..d4cda0a9ee 100644 --- a/workbench/libs/locale/mmakefile.src +++ b/workbench/libs/locale/mmakefile.src @@ -17,7 +17,7 @@ FUNCS := \ #MM workbench-libs-rexxsyslib-includes \ #MM includes-copy #MM- workbench-libs-locale : linklibs -#MM- linklibs-core: linklibs-locale +#MM- core-linklibs: linklibs-locale %build_module mmake=workbench-libs-locale \ modname=locale modtype=library \ diff --git a/workbench/libs/muimaster/mmakefile.src b/workbench/libs/muimaster/mmakefile.src index e2347de4dd..f402d4a74d 100644 --- a/workbench/libs/muimaster/mmakefile.src +++ b/workbench/libs/muimaster/mmakefile.src @@ -393,7 +393,7 @@ BUILDINCTOOL := $(GENDIR)/$(CURDIR)/buildincludes INCLUDEFILES := $(AROS_INCLUDES)/libraries/mui.h $(GENINCDIR)/libraries/mui.h #MM- includes-generate-deps : includes-libraries-mui -#MM- linklibs-core : linklibs-muimaster +#MM- core-linklibs : linklibs-muimaster #MM includes-libraries-mui : includes-mui-setup $(INCLUDEFILES) diff --git a/workbench/libs/muimaster/staticlib/mmakefile.src b/workbench/libs/muimaster/staticlib/mmakefile.src index 656104e41e..e853c5db15 100644 --- a/workbench/libs/muimaster/staticlib/mmakefile.src +++ b/workbench/libs/muimaster/staticlib/mmakefile.src @@ -12,7 +12,7 @@ FILES := \ mui_request #MM- linklibs : linklibs-mui -#MM- linklibs-core : linklibs-mui +#MM- core-linklibs : linklibs-mui #MM linklibs-mui : includes %build_linklib mmake=linklibs-mui libname=mui files=$(FILES) diff --git a/workbench/libs/popupmenu/staticlib/mmakefile.src b/workbench/libs/popupmenu/staticlib/mmakefile.src index 405b4e40db..e00ecb894b 100644 --- a/workbench/libs/popupmenu/staticlib/mmakefile.src +++ b/workbench/libs/popupmenu/staticlib/mmakefile.src @@ -17,7 +17,7 @@ FILES := \ pm_setitemattrs #MM- linklibs : linklibs-popupmenu -#MM- linklibs-core : linklibs-popupmenu +#MM- core-linklibs : linklibs-popupmenu #MM linklibs-popupmenu : includes %build_linklib mmake=linklibs-popupmenu libname=popupmenu files=$(FILES) diff --git a/workbench/libs/workbench/mmakefile.src b/workbench/libs/workbench/mmakefile.src index abd4a4c98c..29c9e8b341 100644 --- a/workbench/libs/workbench/mmakefile.src +++ b/workbench/libs/workbench/mmakefile.src @@ -37,7 +37,7 @@ FUNCS := \ #MM includes-copy #MM workbench-libs-workbench : workbench-libs-icon-linklib -#MM- linklibs-core: linklibs-workbench +#MM- core-linklibs: linklibs-workbench USER_CFLAGS += -D__DOS_NOLIBBASE__ \ -D__UTILITY_NOLIBBASE__ \ -- 2.11.4.GIT