*/mmakefile.src: Remove unneeded uselibs="..." entries

Signed-off-by: Jason S. McMullan <jason.mcmullan@gmail.com> git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44918 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
2025-12-08 06:20:50 +00:00 · 2012-06-01 03:30:04 +00:00
parent 6cd5310f24
commit 6db9a3178a
343 changed files with 10470 additions and 529 deletions
--- a/arch/.unmaintained/m68k-pp-native/TxElf/mmakefile.src
+++ b/arch/.unmaintained/m68k-pp-native/TxElf/mmakefile.src
@ -12,6 +12,6 @@ USER_CFLAGS := -D__AROS

 %build_prog mmake=pp-tools \
    progname=TxElf targetdir=$(EXEDIR) \
-    files=$(FILES) uselibs="coolimagesstatic arossupport amiga arosc m"
+    files=$(FILES) uselibs="coolimagesstatic"

 %common
--- a/arch/all-android/hidd/androidgfx/mmakefile.src
+++ b/arch/all-android/hidd/androidgfx/mmakefile.src
@ -7,6 +7,6 @@ FILES := startup agfx abitmap akbd amouse server

 %build_module mmake=kernel-hidd-androidgfx \
  modname=androidgfx modtype=hidd \
-  files=$(FILES) uselibs="oop rom hiddstubs"
+  files=$(FILES) uselibs="oop hiddstubs"

 %common
--- a/arch/all-hosted/devs/hostdisk/mmakefile.src
+++ b/arch/all-hosted/devs/hostdisk/mmakefile.src
@ -9,7 +9,6 @@ endif

 %build_module mmake=workbench-devs-hostdisk \
  modname=hostdisk modtype=device version=$(AROS_TARGET_PLATFORM) \
-  files="hostdisk_device hostdisk_host automount" \
-  uselibs="arossupport amiga rom"
+  files="hostdisk_device hostdisk_host automount"

 %common
--- a/arch/all-hosted/filesys/emul_handler/mmakefile.src
+++ b/arch/all-hosted/filesys/emul_handler/mmakefile.src
@ -21,6 +21,6 @@ endif

 %build_module mmake=kernel-fs-emul \
    modname=emul modtype=resource modsuffix=handler version=$(AROS_TARGET_PLATFORM) \
-    files="$(FILES) $(FUNCS)" uselibs="rom"
+    files="$(FILES) $(FUNCS)"

 %common
--- a/arch/all-ios/hidd/uikit/mmakefile.src
+++ b/arch/all-ios/hidd/uikit/mmakefile.src
@ -10,7 +10,7 @@ FILES := gfxclass bitmapclass eventtask startup

 %build_module mmake=kernel-hidd-uikit \
  modname=uikit modtype=hidd \
-  files=$(FILES) uselibs="oop rom hiddstubs"
+  files=$(FILES) uselibs="oop hiddstubs"

 NATIVE_BINDIR := $(BINDIR)/Libs/Host
 NATIVE_OBJDIR := $(GENDIR)/$(CURDIR)
--- a/arch/all-linux/hidd/linuxfb/mmakefile.src
+++ b/arch/all-linux/hidd/linuxfb/mmakefile.src
@ -7,6 +7,6 @@ USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES)

 %build_module mmake=kernel-hidd-linuxfb \
  modname=linuxfb modtype=hidd \
-  files=$(FILES) uselibs="rom oop"
+  files=$(FILES) uselibs="oop"

 %common
--- a/arch/all-linux/hidd/pcilinux/mmakefile.src
+++ b/arch/all-linux/hidd/pcilinux/mmakefile.src
@ -6,4 +6,4 @@ FILES	:= pcilinux_init driverclass
 %build_module mmake=hidd-pci-linux \
    modname=pcilinux modtype=hidd \
    files=$(FILES) \
-    uselibs="oop rom amiga"
+    uselibs="oop"
--- a/arch/all-mingw32/boot/mmakefile.src
+++ b/arch/all-mingw32/boot/mmakefile.src
@ -31,7 +31,7 @@ MINGW32_RES	 := hostlib battclock processor
 %link_kickstart mmake=kernel-link-mingw32 file=$(EXEDIR)/aros-bsp-mingw32 \
 	devs=$(MINGW32_DEVS) handlers=$(MINGW32_HANDLERS) hidds=$(MINGW32_HIDD) libs=$(MINGW32_LIBS) res=$(MINGW32_RES) \
 	startup=$(KOBJSDIR)/kernel_resource.o \
-	uselibs="arossupport hiddstubs amiga autoinit libinit rom m" \
+	uselibs="arossupport hiddstubs amiga autoinit libinit arosc.static m" \
 	map=$(GENDIR)/boot/kernel-mingw32.map

 #MM
--- a/arch/all-mingw32/hidd/wingdi/mmakefile.src
+++ b/arch/all-mingw32/hidd/wingdi/mmakefile.src
@ -8,7 +8,7 @@ FILES := startup gdi_hostlib gdigfx bitmap gdikbd gdimouse

 %build_module mmake=kernel-hidd-wingdi \
  modname=wingdi modtype=hidd \
-  files=$(FILES) uselibs="oop rom hiddstubs"
+  files=$(FILES) uselibs="oop hiddstubs"

 DISK_FILES  := disk_startup
 DISK_EXEDIR := $(AROS_DEVS)/Monitors
--- a/arch/all-mingw32/testboot/mmakefile.src
+++ b/arch/all-mingw32/testboot/mmakefile.src
@ -9,7 +9,7 @@ EXEDIR := $(BINDIR)/boot

 %build_prog mmake=test-mingw32-boot \
    progname=testboot targetdir=$(EXEDIR) \
-    files=$(FILES) uselibs="rom" \
+    files=$(FILES) \
    usestartup=no

 %common
--- a/arch/all-native/hidd/vga.hidd/mmakefile.src
+++ b/arch/all-native/hidd/vga.hidd/mmakefile.src
@ -5,6 +5,6 @@ FILES := vga_init vgaclass vgahw bitmap

 %build_module mmake=kernel-hidd-vga \
  modname=vgah modtype=hidd \
-  files=$(FILES) uselibs="oop rom"
+  files=$(FILES) uselibs="oop"

 %common
--- a/arch/all-native/mmakefile.src
+++ b/arch/all-native/mmakefile.src
@ -1,7 +1,7 @@
 include $(TOP)/config/make.cfg

-# 'fs' package includes necessary filesystems and partition.library.
-# These include filesystems and dos.library starter
+# 'fs' package includes necessary filesystems and partition.
+# These include filesystems and dos starter

 #MM kernel-package-fs:		\
 #MM	kernel-fs-afs-pkg	\
@ -26,7 +26,7 @@ FS_HANDLERS := afs cdrom sfs fat
 	      
 %link_kickstart mmake=kernel-link-fs file=$(BINDIR)/boot/aros-fs \
 	handlers=$(FS_HANDLERS) libs=$(FS_LIBS) \
-	uselibs="amiga arossupport rom debug autoinit libinit" \
+	uselibs="amiga arossupport arosc.static debug autoinit libinit" \
 	map=$(GENDIR)/boot/kernel-fs.map deps=kernel-fs-objs

 %common
--- a/arch/all-pc/acpi/mmakefile.src
+++ b/arch/all-pc/acpi/mmakefile.src
@ -6,6 +6,6 @@ FUNCS := findsdt scanentries readreg writereg scansdt shutdowna

 %build_module mmake=kernel-pc-acpi \
  modname=acpi modtype=resource \
-  files="$(FILES) $(FUNCS)" uselibs=rom
+  files="$(FILES) $(FUNCS)"

 %common
--- a/arch/all-pc/boot/grub2-tools/mmakefile.src
+++ b/arch/all-pc/boot/grub2-tools/mmakefile.src
@ -9,6 +9,6 @@ USER_CFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" -isystem $(SRCDIR)/arch/a

 %build_progs mmake=workbench-c-install-grub2 \
    files=$(FILES) targetdir=$(AROS_C) \
-    uselibs="arossupport amiga"
+    uselibs="arossupport"

 %common
--- a/arch/all-pc/bootstrap/mmakefile.src
+++ b/arch/all-pc/bootstrap/mmakefile.src
@ -21,7 +21,7 @@ EXENAME      := bootstrap-pc

 %build_prog mmake=kernel-bootstrap-pc progname=$(EXENAME) \
 	files=$(FILES) targetdir=$(EXEDIR) \
-	uselibs="bootstrap bootconsole rom" usestartup=no linker=kernel
+	uselibs="bootstrap bootconsole" usestartup=no linker=kernel

 %rule_link_binary file=$(OBJDIR)/vesa.bin.o name=vesa objs=$(OBJDIR)/vesa.o \
 	start=0x1000 ldflags="-m elf_i386"
--- a/arch/all-pc/hidds/pcipc/mmakefile.src
+++ b/arch/all-pc/hidds/pcipc/mmakefile.src
@ -5,6 +5,6 @@ FILES := pcipc_init driverclass pciconf1 pciconf2

 %build_module mmake=kernel-pci-pcipc \
    modname=pcipc modtype=hidd \
-    files=$(FILES) uselibs="rom amiga oop"
+    files=$(FILES) uselibs="oop"

 %common
--- a/arch/all-pc/hpet/mmakefile.src
+++ b/arch/all-pc/hpet/mmakefile.src
@ -8,6 +8,6 @@ FUNCS := gethpetcount allochpetunit freehpetunit getunitattrsa

 %build_module mmake=kernel-pc-hpet \
  modname=hpet modtype=resource \
-  files="$(FILES) $(FUNCS)" uselibs=rom
+  files="$(FILES) $(FUNCS)"

 %common
--- a/arch/all-unix/boot/mmakefile.src
+++ b/arch/all-unix/boot/mmakefile.src
@ -58,6 +58,6 @@ endif

 %link_kickstart mmake=kernel-link-unix file=$(BINDIR)/boot/aros-bsp-$(BSP) \
 	devs=$(KDEVS) handlers=$(KHNDLRS) hidds=$(KHIDDS) libs=$(KLIBS) res=$(KRSRCS) startup=$(KOBJSDIR)/kernel_resource.o \
-	uselibs="arossupport hiddstubs amiga autoinit libinit rom m"
+	uselibs="arossupport hiddstubs amiga autoinit arosc.static libinit m"

 %common
--- a/arch/all-unix/devs/midi/mmakefile.src
+++ b/arch/all-unix/devs/midi/mmakefile.src
@ -7,6 +7,6 @@ EXEDIR := $(AROS_DEVS)/Midi

 %build_prog mmake=workbench-devs-hostmidi-unix \
    progname=hostmidi targetdir=$(EXEDIR) \
-    files=hostmidi uselibs="arossupport rom" usestartup=no
+    files=hostmidi usestartup=no

 %common
--- a/arch/all-unix/devs/networks/tap/mmakefile.src
+++ b/arch/all-unix/devs/networks/tap/mmakefile.src
@ -7,6 +7,6 @@ USER_CFLAGS := -DHOST_OS_$(ARCH) -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\
    modname=tap modtype=device version=$(AROS_TARGET_PLATFORM) \
    moduledir=Devs/Networks \
    files="init command iotask" \
-    uselibs="oop amiga rom"
+    uselibs="oop"

 %common
--- a/arch/all-unix/hidd/parallel/mmakefile.src
+++ b/arch/all-unix/hidd/parallel/mmakefile.src
@ -9,7 +9,7 @@ USER_CFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \
 %build_module mmake=workbench-hidd-unix-parallel \
  modname=parallel modtype=hidd \
  files=$(FILES) \
-  uselibs="amiga oop rom"
+  uselibs="oop"

 #MM workbench-hidd-unix-parallel : kernel-unixio

--- a/arch/all-unix/hidd/serial/mmakefile.src
+++ b/arch/all-unix/hidd/serial/mmakefile.src
@ -9,7 +9,7 @@ USER_CFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \
 %build_module mmake=workbench-hidd-unix-serial \
  modname=serial modtype=hidd \
  files=$(FILES) \
-  uselibs="amiga oop rom"
+  uselibs="oop"


 #MM workbench-hidd-unix-serial : kernel-unixio
--- a/arch/all-unix/hidd/unixio/mmakefile.src
+++ b/arch/all-unix/hidd/unixio/mmakefile.src
@ -15,7 +15,7 @@ USER_CFLAGS += -Wno-attributes

 %build_module mmake=kernel-unixio \
    modname=unixio modtype=hidd version=$(AROS_TARGET_PLATFORM) \
-    files=unixio_class uselibs="oop rom"
+    files=unixio_class uselibs="oop"

 MY_INCLS := $(call WILDCARD, include/*.h)
 DEST_INC := $(foreach f,$(MY_INCLS), $(AROS_INCLUDES)/hidd/$(notdir $f))
--- a/arch/all-unix/libs/oss/mmakefile.src
+++ b/arch/all-unix/libs/oss/mmakefile.src
@ -37,4 +37,4 @@ endif

 %build_module mmake=workbench-libs-oss-unix-module modname=oss \
    modtype=library version=$(AROS_TARGET_PLATFORM) files="$(FILES) oss_init" linklibname=ossshared \
-    uselibs="amiga rom m oop"
+    uselibs="oop"
--- a/arch/i386-pc/boot/mmakefile.src
+++ b/arch/i386-pc/boot/mmakefile.src
@ -35,7 +35,7 @@ include $(TOP)/config/make.cfg
 #MM     kernel-workbench-devs-pc-i386

 EXEDIR  := $(BINDIR)/boot
-USELIBS	:= hiddstubs amiga arossupport debug rom arosm autoinit libinit
+USELIBS	:= hiddstubs amiga arossupport debug arosc.static arosm autoinit libinit

 KRSRCS  := acpi battclock hpet processor
 KLIBS   := exec expansion oop utility debug
--- a/arch/i386-pc/drivers/parallel.hidd/mmakefile.src
+++ b/arch/i386-pc/drivers/parallel.hidd/mmakefile.src
@ -6,4 +6,4 @@ FILES	:=	ParallelClass ParallelUnitClass
 %build_module mmake=kernel-pc-i386-parallel \
  modname=parallel modtype=hidd \
  files=$(FILES) \
-  uselibs="hiddstubs rom amiga oop"
+  uselibs="hiddstubs oop"
--- a/arch/i386-pc/drivers/serial.hidd/mmakefile.src
+++ b/arch/i386-pc/drivers/serial.hidd/mmakefile.src
@ -6,5 +6,5 @@ FILES	:=	serial_init SerialClass SerialUnitClass
 %build_module mmake=kernel-pc-i386-serial \
  modname=serial modtype=hidd \
  files=$(FILES) \
-  uselibs="hiddstubs rom amiga oop"
+  uselibs="hiddstubs oop"
  
--- a/arch/i386-pc/drivers/trackdisk/mmakefile.src
+++ b/arch/i386-pc/drivers/trackdisk/mmakefile.src
@ -9,4 +9,4 @@ USER_INCLUDES := -I$(TOP)/rom/devs
 %build_module mmake=kernel-pc-i386-trackdisk \
  modname=trackdisk modtype=device \
  files="trackdisk_device trackdisk_hw" \
-  uselibs="hiddstubs arossupport rom amiga oop"
+  uselibs="hiddstubs oop"
--- a/arch/m68k-all/test/mmakefile.src
+++ b/arch/m68k-all/test/mmakefile.src
@ -12,6 +12,6 @@ USER_CFLAGS = -I$(SRCDIR)/arch/m68k-all/dos

 %build_progs mmake=test-m68k \
    files=$(FILES) targetdir=$(EXEDIR) \
-    usestartup=no uselibs="rom"
+    usestartup=no

 %common
--- a/arch/m68k-amiga/boot/mmakefile.src
+++ b/arch/m68k-amiga/boot/mmakefile.src
@ -47,7 +47,7 @@ Q ?= @

 #MM- kernel-workbench-devs-amiga-m68k : workbench-devs-amiga-m68k

-USELIBS := amiga arossupport rom arosm autoinit libinit \
+USELIBS := amiga arossupport arosc.static arosm autoinit libinit \
 	   hiddstubs 
 LIBS    := $(addprefix -l,$(USELIBS)) -L$(GENDIR)/lib -lloadseg
 DEPLIBS := $(addprefix $(LIBDIR)/lib,$(addsuffix .a,$(USELIBS)))
--- a/arch/m68k-amiga/c/mmakefile.src
+++ b/arch/m68k-amiga/c/mmakefile.src
@ -37,46 +37,45 @@ USER_AFLAGS := -I$(GENINCDIR) -Os

 AROS_BOOT := $(BINDIR)/boot

+USER_LDFLAGS := -noarosc
+
 FILES := gdbstub

 %build_progs mmake=workbench-c-m68k-gdbstub \
    files=$(FILES) targetdir=$(AROS_C) \
-    uselibs="arossupport amiga rom" \
    detach=yes

 FILES := gdbstop

 %build_progs mmake=workbench-c-m68k-gdbstop \
-    files=$(FILES) targetdir=$(AROS_C) \
-    uselibs="arossupport amiga rom" \
+    files=$(FILES) targetdir=$(AROS_C)

 CFILES := SetPatchAROS
 AFILES := newstackswap
 USER_INCLUDES := -isystem $(SRCDIR)/rom/dos/include
-USER_LDFLAGS  := -L$(GENDIR)/lib
+USER_LDFLAGS  := -L$(GENDIR)/lib -noarosc

 %build_prog mmake=workbench-c-m68k-setpatcharos progname=SetPatchAROS \
    files=$(CFILES) asmfiles=$(AFILES) targetdir=$(AROS_BOOT) \
-    uselibs="loadseg arossupport amiga rom"
+    uselibs="loadseg"

 CFILES	      := AROSBootstrap

 %build_prog mmake=workbench-c-m68k-arosbootstrap progname=AROSBootstrap \
    files=$(CFILES) targetdir=$(AROS_BOOT) \
-    usestartup=no uselibs="loadseg arossupport amiga z_static rom"
+    usestartup=no uselibs="loadseg z.static"

 CFILES	      := mmudump

 %build_prog mmake=workbench-c-m68k-mmudump progname=MMUDump \
    files=$(CFILES) targetdir=$(AROS_C) \
-    usestartup=no uselibs="arossupport amiga rom"
+    usestartup=no

 CFILES		:= SetPatch patches
 AFILES		:= copymem_040 copymem_060
 USER_INCLUDES := -isystem

 %build_prog mmake=workbench-c-m68k-setpatch progname=SetPatch \
-    files=$(CFILES) asmfiles=$(AFILES) targetdir=$(AROS_C) \
-    uselibs="arossupport amiga rom"
+    files=$(CFILES) asmfiles=$(AFILES) targetdir=$(AROS_C)

 %common
--- a/arch/m68k-amiga/devs/audio/mmakefile.src
+++ b/arch/m68k-amiga/devs/audio/mmakefile.src
@ -5,4 +5,4 @@ FILES := audio audio_hardware

 %build_module mmake=kernel-amiga-m68k-audio \
    modname=audio modtype=device \
-    files="$(FILES)" uselibs="hiddstubs rom"
+    files="$(FILES)" uselibs="hiddstubs"
--- a/arch/m68k-amiga/devs/trackdisk/mmakefile.src
+++ b/arch/m68k-amiga/devs/trackdisk/mmakefile.src
@ -7,4 +7,4 @@ include $(TOP)/config/make.cfg
 %build_module mmake=kernel-amiga-m68k-trackdisk \
  modname=trackdisk modtype=device \
  files="trackdisk_device trackdisk_hw" \
-  uselibs="rom amiga oop"
+  uselibs="oop"
--- a/arch/m68k-amiga/diag/mmakefile.src
+++ b/arch/m68k-amiga/diag/mmakefile.src
@ -5,6 +5,6 @@ USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module_simple mmake=kernel-diag \
  modname=diag modtype=hook \
-  files="diag resident_end" compiler=target uselibs="rom"
+  files="diag resident_end" compiler=target

 %common
--- a/arch/m68k-amiga/hidd/gfx/mmakefile.src
+++ b/arch/m68k-amiga/hidd/gfx/mmakefile.src
@ -9,4 +9,4 @@ USER_CFLAGS += -D__OOP_NOATTRBASES__ -D__OOP_NOMETHODBASES__ \

 %build_module mmake=kernel-amiga-m68k-amigavideo \
    modname=amigavideo modtype=hidd \
-    files="startup amigavideogfx amigavideobitmap chipset blitter" uselibs="rom oop hiddstubs"
+    files="startup amigavideogfx amigavideobitmap chipset blitter" uselibs="oop hiddstubs"
--- a/arch/m68k-amiga/hidd/keyboard/mmakefile.src
+++ b/arch/m68k-amiga/hidd/keyboard/mmakefile.src
@ -5,4 +5,4 @@ USER_CFLAGS += -D__UTILITY_NOLIBBASE__ -D__OOP_NOLIBBASE__

 %build_module mmake=kernel-amiga-m68k-kbd \
    modname=amigakbd modtype=hidd \
-    files="startup kbd_init kbdclass" uselibs="rom oop hiddstubs"
+    files="startup kbd_init kbdclass" uselibs="oop hiddstubs"
--- a/arch/m68k-amiga/hidd/mouse/mmakefile.src
+++ b/arch/m68k-amiga/hidd/mouse/mmakefile.src
@ -8,4 +8,4 @@ USER_CFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__

 %build_module mmake=kernel-amiga-m68k-mouse \
    modname=amigamouse modtype=hidd \
-    files="startup mouse_init mouseclass" uselibs="rom oop hiddstubs"
+    files="startup mouse_init mouseclass" uselibs="oop hiddstubs"
--- a/arch/m68k-amiga/hidd/uaegfx/mmakefile.src
+++ b/arch/m68k-amiga/hidd/uaegfx/mmakefile.src
@ -7,4 +7,4 @@ USER_CFLAGS := -D__OOP_NOATTRBASES__ -D__GRAPHICS_NOHIDDBASE__ \

 %build_module mmake=kernel-amiga-m68k-uaegfx \
    modname=uaegfx modtype=hidd \
-    files="startup uaegfx uaegfxbitmap uaertg" uselibs="rom oop"
+    files="startup uaegfx uaegfxbitmap uaertg" uselibs="oop"
--- a/arch/m68k-amiga/romboot/mmakefile.src
+++ b/arch/m68k-amiga/romboot/mmakefile.src
@ -5,6 +5,6 @@ USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module_simple mmake=kernel-romboot \
  modname=romboot modtype=hook \
-  files="romboot resident_end" compiler=target uselibs="rom"
+  files="romboot resident_end" compiler=target

 %common
--- a/arch/m68k-amiga/wb.tag/mmakefile.src
+++ b/arch/m68k-amiga/wb.tag/mmakefile.src
@ -5,6 +5,6 @@ USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module_simple mmake=kernel-amiga-m68k-wbtag \
    modname=wbtag modtype=resource \
-    files="wbtag resident_end" uselibs="rom"
+    files="wbtag resident_end"

 %common
--- a/arch/ppc-chrp/efika/bestcomm/mmakefile.src
+++ b/arch/ppc-chrp/efika/bestcomm/mmakefile.src
@ -3,4 +3,4 @@ include $(TOP)/config/make.cfg

 %build_module mmake=kernel-bestcomm-chrp-ppc-efika 	\
  modname=bestcomm modtype=resource		\
-  files="bestcomm_init" uselibs="rom"
+  files="bestcomm_init"
--- a/arch/ppc-chrp/efika/kernel/mmakefile.src
+++ b/arch/ppc-chrp/efika/kernel/mmakefile.src
@ -26,6 +26,6 @@ $(BINDIR)/boot/aros-efika: $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_librar
 #%build_module mmake=kernel-kernel-chrp-ppc-efika \
 #  modname=kernel modtype=resource                \
 #  cflags="$(CFLAGS) -I$(SRCDIR)/rom/exec"        \
-#  files="$(FILES)" uselibs="rom"
+#  files="$(FILES)"

 %common
--- a/arch/ppc-chrp/efika/pci/mmakefile.src
+++ b/arch/ppc-chrp/efika/pci/mmakefile.src
@ -4,4 +4,4 @@ include $(TOP)/config/make.cfg
 %build_module mmake=kernel-pci-efika \
  modname=pci-efika modtype=hidd \
  files="pci_efika_init driverclass" \
-  uselibs="rom amiga oop"
+  uselibs="oop"
--- a/arch/ppc-chrp/rtas/mmakefile.src
+++ b/arch/ppc-chrp/rtas/mmakefile.src
@ -5,4 +5,4 @@ include $(TOP)/config/make.cfg

 %build_module mmake=kernel-rtas-chrp-ppc 	\
  modname=rtas modtype=resource		\
-  files="rtas_init" uselibs="rom"
+  files="rtas_init"
--- a/arch/ppc-sam440/boot/mmakefile.src
+++ b/arch/ppc-sam440/boot/mmakefile.src
@ -70,7 +70,7 @@ $(BINDIR)/boot/aros-amcc440: $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_libr
 	@$(ECHO) "Linking    boot/aros-amcc440"
 	$(TARGET_CC) -nostartfiles -Wl,-Map -Wl,$(OSGENDIR)/boot/kernel.map -Wl,-T -Wl,$(SRCDIR)/$(CURDIR)/ldscript.lds \
        -o $@ $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_library.o \
-        -L$(LIBDIR) -larossupport -lrom -larosm -lamiga -lautoinit -llibinit -lgcc
+        -L$(LIBDIR) -larossupport -larosc.static -larosm -lamiga -lautoinit -llibinit -lgcc


 PKG_LIBS     := aros partition expansion utility oop graphics layers intuition keymap workbench dos poseidon
--- a/arch/ppc-sam440/i2c/mmakefile.src
+++ b/arch/ppc-sam440/i2c/mmakefile.src
@ -4,7 +4,7 @@ include $(TOP)/config/make.cfg
 %build_module mmake=hidd-i2c-amcc440 \
  modname=i2c-amcc440 modtype=hidd \
  files="i2c-amcc440" \
-  uselibs="rom amiga oop"
+  uselibs="oop"

 %common
-  
+  
--- a/arch/ppc-sam440/pci/mmakefile.src
+++ b/arch/ppc-sam440/pci/mmakefile.src
@ -4,4 +4,4 @@ include $(TOP)/config/make.cfg
 %build_module mmake=kernel-pci-amcc440 \
  modname=pci-amcc440 modtype=hidd \
  files="pci_amcc440_init driverclass" \
-  uselibs="rom amiga oop"
+  uselibs="oop"
--- a/arch/x86_64-pc/boot/mmakefile.src
+++ b/arch/x86_64-pc/boot/mmakefile.src
@ -41,7 +41,7 @@ USER_LDFLAGS := -L$(GENDIR)/lib

 %link_kickstart mmake=kernel-bsp-x86_64-pc file=$(BINDIR)/boot/aros-bsp-pc-x86_64 \
 	devs=$(KDEVS) hidds=$(KHIDDS) libs=$(KLIBS) res=$(KRSRCS) startup=$(KOBJSDIR)/kernel_resource.o \
-	uselibs="bootconsole autoinit libinit amiga arossupport rom arosm hiddstubs" \
+	uselibs="bootconsole autoinit libinit amiga arossupport arosc.static arosm hiddstubs" \
 	map=$(GENDIR)/boot/kernel-bsp-x86_64-pc.map

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

 %build_module_simple mmake=kernel-alerthook \
  modname=alert modtype=hook \
-  files="alerthook resident_end" compiler=target uselibs="rom"
+  files="alerthook resident_end" compiler=target

 %common
--- a/rom/bootloader/mmakefile.src
+++ b/rom/bootloader/mmakefile.src
@ -9,4 +9,4 @@ USER_CFLAGS += -D__UTILITY_NOLIBBASE__

 %build_module mmake=kernel-bootloader \
    modname=bootloader modtype=resource \
-    files="bootloader_init getbootinfo" uselibs="rom utility"
+    files="bootloader_init getbootinfo"
--- a/rom/debug/mmakefile.src
+++ b/rom/debug/mmakefile.src
@ -12,6 +12,6 @@ USER_CFLAGS := -DHOST_OS_$(FAMILY) -D__UTILITY_NOLIBBASE__
 %build_module mmake=kernel-debug \
  modname=debug modtype=library \
  uselibs="utility" \
-  files="$(FILES) $(FUNCS)" linklibfiles=$(STATICFUNCS) uselibs=rom
+  files="$(FILES) $(FUNCS)" linklibfiles=$(STATICFUNCS)

 %common
--- a/rom/devs/ahci/mmakefile.src
+++ b/rom/devs/ahci/mmakefile.src
@ -19,6 +19,6 @@ USER_CFLAGS := -D__BSD_VISIBLE
 %build_module mmake=kernel-ahci \
  modname=ahci modtype=device \
  files="$(FILES)" \
-  uselibs="rom oop hiddstubs"
+  uselibs="oop hiddstubs"

 %common
--- a/rom/devs/ata/mmakefile.src
+++ b/rom/devs/ata/mmakefile.src
@ -17,4 +17,4 @@ USER_CFLAGS += -D__TIMER_NOLIBBASE__
 %build_module mmake=kernel-ata \
  modname=ata modtype=device version=$(AROS_TARGET_PLATFORM) \
  files="ata_init lowlevel ata dma_generic timer scsiemu $(BUS_DRIVERS)" \
-  uselibs="rom oop"
+  uselibs="oop"
--- a/rom/devs/console/mmakefile.src
+++ b/rom/devs/console/mmakefile.src
@ -14,8 +14,7 @@ USER_CFLAGS := -D__GRAPHICS_NOLIBBASE__ \

 %build_module mmake=kernel-console \
  modname=console modtype=device \
-  files="console $(FUNCS) $(FILES)" \
-  uselibs="amiga rom"
+  files="console $(FUNCS) $(FILES)"

 #MM includes-copy

--- a/rom/devs/gameport/mmakefile.src
+++ b/rom/devs/gameport/mmakefile.src
@ -9,7 +9,7 @@ USER_CFLAGS += -D__OOP_NOLIBBASE__

 %build_module mmake=kernel-gameport \
  modname=gameport modtype=device \
-  files=gameport uselibs="oop rom"
+  files=gameport uselibs="oop"

 #MM includes-copy

--- a/rom/devs/input/mmakefile.src
+++ b/rom/devs/input/mmakefile.src
@ -10,6 +10,5 @@ USER_CFLAGS += -D__GRAPHICS_NOLIBBASE__

 %build_module mmake=kernel-input \
  modname=input modtype=device \
-  files="input $(FUNCS) $(FILES)" \
-  uselibs="rom"
+  files="input $(FUNCS) $(FILES)"

--- a/rom/devs/keyboard/mmakefile.src
+++ b/rom/devs/keyboard/mmakefile.src
@ -9,4 +9,4 @@ USER_CFLAGS += -D__OOP_NOLIBBASE__

 %build_module mmake=kernel-keyboard \
  modname=keyboard modtype=device \
-  files=keyboard uselibs="oop rom"
+  files=keyboard uselibs="oop"
--- a/rom/dos/mmakefile.src
+++ b/rom/dos/mmakefile.src
@ -64,8 +64,7 @@ USER_CFLAGS += -DAROS_CPU="\"$(AROS_TARGET_CPU)\""

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

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

--- a/rom/dosboot/mmakefile.src
+++ b/rom/dosboot/mmakefile.src
@ -13,7 +13,7 @@ USER_INCLUDES := -I$(SRCDIR)/rom/devs -I$(GENDIR)/$(CURDIR)

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

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

--- a/rom/efi/mmakefile.src
+++ b/rom/efi/mmakefile.src
@ -5,6 +5,6 @@ FILES := efi_init
 FUNCS := findconfigtable shutdowna

 %build_module mmake=kernel-efi modname=efi modtype=resource \
-  files="$(FILES) $(FUNCS)" uselibs=rom
+  files="$(FILES) $(FUNCS)" 

 %common
--- a/rom/exec/mmakefile.src
+++ b/rom/exec/mmakefile.src
@ -44,7 +44,6 @@ USER_INCLUDES += $(PRIV_EXEC_INCLUDES) -DAROS_ARCH_$(ARCH)

 %build_module mmake=kernel-exec \
  modname=exec modtype=library version=$(AROS_TARGET_PLATFORM) \
-  files="$(INIT_FILES) $(ALL_FUNCTIONS) $(FILES)" \
-  uselibs="arossupport rom"
+  files="$(INIT_FILES) $(ALL_FUNCTIONS) $(FILES)"

 %common
--- a/rom/expansion/mmakefile.src
+++ b/rom/expansion/mmakefile.src
@ -28,5 +28,4 @@ endif

 %build_module mmake=kernel-expansion \
  modname=expansion modtype=library version=$(VERSION) \
-  files="expansion_init $(FUNCS)" \
-  uselibs=rom
+  files="expansion_init $(FUNCS)"
--- a/rom/filesys/AmberRAM/mmakefile.src
+++ b/rom/filesys/AmberRAM/mmakefile.src
@ -6,6 +6,6 @@ USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module_simple mmake=kernel-fs-amberram \
    modname=amberram modtype=handler \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"

 %common
--- a/rom/filesys/CDVDFS/src/mmakefile.src
+++ b/rom/filesys/CDVDFS/src/mmakefile.src
@ -23,21 +23,20 @@ USER_CFLAGS := -DNDEBUG -DDEBUG=0

 %build_prog mmake=kernel-fs-cdvdfs-cdcontrol \
    progname=cdcontrol targetdir=$(AROS_C) \
-    files="$(CDCONTROL_FILES)" uselibs="amiga arosc"
+    files="$(CDCONTROL_FILES)"

 %build_prog mmake=kernel-fs-cdvdfs-cdrom \
    progname=cdrom targetdir=$(TESTSDIR) \
-    files="$(CDROM_FILES)" uselibs="amiga arosc"
+    files="$(CDROM_FILES)"

 %build_prog mmake=kernel-fs-cdvdfs-checkcd \
    progname=checkcd targetdir=$(AROS_C) \
-    files="$(CHECKCD_FILES)" uselibs="amiga arosc"
+    files="$(CHECKCD_FILES)"

 USER_CFLAGS := -DAROS_KERNEL $(USER_CFLAGS)

 %build_module mmake=kernel-fs-cdvdfs \
    modname=cdrom modtype=handler \
-    files="$(HANDLER_FILES)" \
-    uselibs="arossupport rom"
+    files="$(HANDLER_FILES)"

 %common
--- a/rom/filesys/SFS/FS/mmakefile.src
+++ b/rom/filesys/SFS/FS/mmakefile.src
@ -29,6 +29,6 @@ USER_CFLAGS := -DSFS_BE -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module mmake=kernel-fs-sfs \
    modname=sfs modtype=handler \
-    files="$(FILES)" uselibs="arossupport rom"
+    files="$(FILES)"

 %common
--- a/rom/filesys/SFS/SFSdefrag/mmakefile.src
+++ b/rom/filesys/SFS/SFSdefrag/mmakefile.src
@ -14,6 +14,6 @@ USER_CFLAGS := -I $(SRCDIR)/$(CURDIR)/../FS

 %build_prog mmake=workbench-devs-sfs-c-sfsdefrag \
    progname=SFSdefrag targetdir=$(EXEDIR) \
-    files=$(FILES) uselibs="mui amiga arosc m"
+    files=$(FILES) uselibs="mui arosc"

 %common
--- a/rom/filesys/SFS/SFSdefragmentGUI/mmakefile.src
+++ b/rom/filesys/SFS/SFSdefragmentGUI/mmakefile.src
@ -7,6 +7,6 @@ USER_CFLAGS := -I $(SRCDIR)/$(CURDIR)/../FS -DADATE="\"$(shell date '+%d.%m.%Y')

 %build_prog mmake=workbench-devs-sfs-c-sfsdefragmentgui \
    files=SFSdefragmentGUI progname=SFSdefragmentGUI targetdir=$(AROS_C) \
-    uselibs="arossupport amiga arosc m"
+    uselibs="arosc"

 %common
--- a/rom/filesys/SFS/SFSformat/mmakefile.src
+++ b/rom/filesys/SFS/SFSformat/mmakefile.src
@ -6,7 +6,6 @@ include $(TOP)/config/make.cfg
 USER_CFLAGS     := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_prog mmake=workbench-devs-sfs-c-sfsformat \
-    files=SFSformat progname=SFSformat targetdir=$(AROS_C) \
-    uselibs="arossupport amiga arosc m"
+    files=SFSformat progname=SFSformat targetdir=$(AROS_C)

 %common
--- a/rom/filesys/SFS/SFSquery/mmakefile.src
+++ b/rom/filesys/SFS/SFSquery/mmakefile.src
@ -6,7 +6,6 @@ include $(TOP)/config/make.cfg
 USER_CFLAGS     := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_prog mmake=workbench-devs-sfs-c-sfsquery \
-    files=SFSquery progname=SFSquery targetdir=$(AROS_C) \
-    uselibs="arossupport amiga arosc m"
+    files=SFSquery progname=SFSquery targetdir=$(AROS_C)

 %common
--- a/rom/filesys/SFS/SetCache/mmakefile.src
+++ b/rom/filesys/SFS/SetCache/mmakefile.src
@ -6,7 +6,6 @@ include $(TOP)/config/make.cfg
 USER_CFLAGS     := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_prog mmake=workbench-devs-sfs-c-setcache \
-    files=SetCache progname=SetCache targetdir=$(AROS_C) \
-    uselibs="arossupport amiga arosc m"
+    files=SetCache progname=SetCache targetdir=$(AROS_C)

 %common
--- a/rom/filesys/afs/mmakefile.src
+++ b/rom/filesys/afs/mmakefile.src
@ -22,6 +22,6 @@ USER_CFLAGS := -D__INTUITION_NOLIBBASE__ -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module mmake=kernel-fs-afs \
    modname=afs modtype=handler \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"

 %common
--- a/rom/filesys/console_handler/mmakefile.src
+++ b/rom/filesys/console_handler/mmakefile.src
@ -9,4 +9,4 @@ USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\""

 %build_module_simple mmake=kernel-fs-con \
    modname=con modtype=handler \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"
--- a/rom/filesys/fat/mmakefile.src
+++ b/rom/filesys/fat/mmakefile.src
@ -9,7 +9,7 @@ FILES := cache charset direntry disk fat file lock main names packet\

 %build_module mmake=kernel-fs-fat \
    modname=fat modtype=handler \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"


 %common
--- a/rom/filesys/pfs3/fs/mmakefile.src
+++ b/rom/filesys/pfs3/fs/mmakefile.src
@ -52,7 +52,7 @@ USER_CFLAGS := \

 %build_module mmake=kernel-fs-pfs3 \
    modname=pfs3 modtype=handler \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"

 USER_CFLAGS := \
    -DAROS_KERNEL $(PFS3DS_CFLAGS) -DMIN_LIB_VERSION=36 \
@ -60,7 +60,7 @@ USER_CFLAGS := \

 %build_module mmake=kernel-fs-pfs3ds \
    modname=pfs3ds modtype=handler \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"

 KS13STUFF := \
    -DKS13WRAPPER \
@ -77,7 +77,7 @@ USER_CFLAGS := \

 %build_module mmake=kernel-fs-pfs3-ks13 \
    modname=pfs3_ks13 modtype=handler \
-    files="$(FILES) ks13wrapper" uselibs="rom"
+    files="$(FILES) ks13wrapper"

 USER_CFLAGS := \
    -DAROS_KERNEL $(PFS3DS_CFLAGS) $(KS13STUFF) \
@ -85,7 +85,7 @@ USER_CFLAGS := \

 %build_module mmake=kernel-fs-pfs3ds-ks13 \
    modname=pfs3ds_ks13 modtype=handler \
-    files="$(FILES) ks13wrapper" uselibs="rom"
+    files="$(FILES) ks13wrapper"


 %common
--- a/rom/graphics/mmakefile.src
+++ b/rom/graphics/mmakefile.src
@ -221,4 +221,4 @@ FUNCTIONS := \
 %build_module mmake=kernel-graphics \
  modname=graphics modtype=library \
  files="graphics_init $(FUNCTIONS) $(FILES)" \
-  uselibs="oop rom"
+  uselibs="oop"
--- a/rom/hidds/graphics/mmakefile.src
+++ b/rom/hidds/graphics/mmakefile.src
@ -18,7 +18,7 @@ USER_CFLAGS      += -D__GRAPHICS_NOLIBBASE__ \
 %build_module mmake=kernel-hidd-graphics \
  modname=graphics modtype=hidd \
  files=$(FILES) \
-  uselibs="oop rom"
+  uselibs="oop"

 LIBNAME     := graphics

--- a/rom/hidds/hidd.pci/mmakefile.src
+++ b/rom/hidds/hidd.pci/mmakefile.src
@ -31,4 +31,4 @@ $(AROS_DEVS)/pci.ids : pci.ids
 %build_module mmake=kernel-pci \
    modname=pci modtype=hidd \
    files="$(FILES)" \
-    uselibs="oop rom amiga"
+    uselibs="oop"
--- a/rom/hidds/hidd.pci/pcitool/mmakefile.src
+++ b/rom/hidds/hidd.pci/pcitool/mmakefile.src
@ -13,7 +13,7 @@ EXEDIR = $(AROSDIR)/Tools

 %build_prog mmake=workbench-tools-pcitool \
    progname=PCITool targetdir=$(EXEDIR) \
-    files=$(FILES) uselibs="mui amiga arosc m hiddstubs"
+    files=$(FILES) uselibs="mui hiddstubs"

 %common

--- a/rom/hidds/hidd/mmakefile.src
+++ b/rom/hidds/hidd/mmakefile.src
@ -7,7 +7,7 @@ USER_CFLAGS := -DAROS_USE_OOP \

 %build_module mmake=kernel-hidd \
  modname=hiddclass modtype=hidd \
-  files=hiddclass uselibs="oop rom"
+  files=hiddclass uselibs="oop"

 INCLUDE_FILES   :=  $(call WILDCARD, include/*.h)
 %copy_includes path=hidd dir=include
--- a/rom/hidds/kbd/mmakefile.src
+++ b/rom/hidds/kbd/mmakefile.src
@ -16,6 +16,6 @@ USER_CFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__
 %build_module mmake=kernel-hidd-kbd \
    modname=keyboard modtype=hidd \
    files="$(FILES)" \
-    uselibs="oop rom amiga"
+    uselibs="oop"

 %common
--- a/rom/hidds/mouse/mmakefile.src
+++ b/rom/hidds/mouse/mmakefile.src
@ -32,6 +32,6 @@ USER_CFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__
 %build_module mmake=kernel-hidd-mouse \
    modname=mouse modtype=hidd \
    files="$(FILES)" \
-    uselibs="oop rom amiga"
+    uselibs="oop"

 %common
--- a/rom/hidds/vesa.hidd/mmakefile.src
+++ b/rom/hidds/vesa.hidd/mmakefile.src
@ -9,4 +9,4 @@ FILES	:=	\

 %build_module mmake=kernel-hidd-vesa \
  modname=vesagfx modtype=hidd \
-  files=$(FILES) uselibs="oop rom"
+  files=$(FILES) uselibs="oop"
--- a/rom/hyperlayers/mmakefile.src
+++ b/rom/hyperlayers/mmakefile.src
@ -60,5 +60,4 @@ USER_CFLAGS := -D__UTILITY_NOLIBBASE__ -D__GRAPHICS_NOLIBBASE__

 %build_module mmake=kernel-layers \
  modname=layers modtype=library \
-  files="layers_init $(FUNCS) $(FILES)" \
-  uselibs=rom
+  files="layers_init $(FUNCS) $(FILES)"
--- a/rom/intuition/mmakefile.src
+++ b/rom/intuition/mmakefile.src
@ -183,6 +183,6 @@ USER_INCLUDES := -D__DOS_NOLIBBASE__ \

 %build_module mmake=kernel-intuition \
  modname=intuition modtype=library \
-  files="intuition_init $(FUNCS) $(FILES)" uselibs="rom oop"
+  files="intuition_init $(FUNCS) $(FILES)" uselibs="oop"


--- a/rom/isapnp/mmakefile.src
+++ b/rom/isapnp/mmakefile.src
@ -5,7 +5,7 @@ USER_CFLAGS := -fstrict-aliasing -W -Wall -Wstrict-prototypes -Wno-unused -I$(GE

 %build_module_simple mmake=kernel-isapnp \
    modname=isapnp modtype=resource \
-    files="$(FILES)" uselibs="rom"
+    files="$(FILES)"

 # This causes generation of version.h at makedepend stage. Otherwise the build fails.
 $(OBJDIR)/init.d: $(GENDIR)/$(CURDIR)/version.h
@ -21,7 +21,7 @@ $(GENDIR)/$(CURDIR)/version.h:	version.rev version.date

 %build_prog mmake=workbench-c-isapnp progname=ISApnp \
    files=isapnp targetdir=$(AROS_C) \
-    uselibs="arossupport amiga rom" usestartup=no
+    usestartup=no

 INCLUDE_FILES := include/isapnp.h
 %copy_includes path=resources dir=include
--- a/rom/kernel/mmakefile.src
+++ b/rom/kernel/mmakefile.src
@ -39,6 +39,6 @@ endif

 %build_module mmake=kernel-kernel \
  modname=kernel modtype=resource version=$(AROS_TARGET_PLATFORM) \
-  files="$(FILES) $(FUNCS)" uselibs="rom $(USER_LIBS)" nostartup=no
+  files="$(FILES) $(FUNCS)" uselibs="$(USER_LIBS)" nostartup=no

 %common
--- a/rom/keymap/mmakefile.src
+++ b/rom/keymap/mmakefile.src
@ -14,5 +14,4 @@ FUNCS := askkeymapdefault mapansi maprawkey setkeymapdefault

 %build_module mmake=kernel-keymap \
  modname=keymap modtype=library \
-  files="keymap_init $(FUNCS) $(FILES)" \
-  uselibs="rom"
+  files="keymap_init $(FUNCS) $(FILES)"
--- a/rom/lddemon/mmakefile.src
+++ b/rom/lddemon/mmakefile.src
@ -5,6 +5,6 @@ USER_CFLAGS += -D__DOS_NOLIBBASE__

 %build_module mmake=kernel-lddemon \
  modname=lddemon modtype=resource \
-  files="lddemon" uselibs="rom"
+  files="lddemon" 

 %common
--- a/rom/mmakefile.src
+++ b/rom/mmakefile.src
@ -105,7 +105,7 @@ BASE_RSRCS    := bootloader dosboot FileSystem lddemon

 %link_kickstart mmake=kernel-link-base file=$(BINDIR)/boot/aros-base \
 	devs=$(BASE_DEVICES) handlers=$(BASE_HANDLERS) hidds=$(BASE_HIDD) libs=$(BASE_LIBS) res=$(BASE_RSRCS) \
-	uselibs="autoinit libinit amiga arossupport rom arosm hiddstubs" \
+	uselibs="autoinit libinit amiga arossupport arosc.static arosm hiddstubs" \
 	map=$(GENDIR)/boot/kernel-base.map

 # *** PKG kickstart package ***
--- a/rom/oop/mmakefile.src
+++ b/rom/oop/mmakefile.src
@ -31,8 +31,7 @@ USER_CFLAGS := -DAROS_USE_OOP -D__OOP_NOLIBBASE__ \

 %build_module mmake=kernel-oop \
  modname=oop modtype=library \
-  files="oop_init $(FUNCS) $(FILES)" \
-  uselibs="rom"
+  files="oop_init $(FUNCS) $(FILES)"

 #MM includes-copy

--- a/rom/openfirmware/mmakefile.src
+++ b/rom/openfirmware/mmakefile.src
@ -3,4 +3,4 @@ include $(TOP)/config/make.cfg

 %build_module mmake=kernel-openfirmware 	\
  modname=openfirmware modtype=resource		\
-  cflags="$(CFLAGS)" files="of_init" uselibs="rom"
+  cflags="$(CFLAGS)" files="of_init"
--- a/rom/partition/mmakefile.src
+++ b/rom/partition/mmakefile.src
@ -48,6 +48,6 @@ USER_LDFLAGS  := -L$(GENDIR)/lib

 %build_module mmake=kernel-partition \
    modname=partition modtype=library \
-    files="partition_init $(FUNCS) $(FILES)" uselibs="debug loadseg rom"
+    files="partition_init $(FUNCS) $(FILES)" uselibs="debug loadseg"

 %common
--- a/rom/processor/mmakefile.src
+++ b/rom/processor/mmakefile.src
@ -6,4 +6,4 @@ include $(TOP)/config/make.cfg
 #MM kernel-processor: includes

 %build_module mmake=kernel-processor modname=processor modtype=resource \
-    version=$(AROS_TARGET_PLATFORM) files="init getcpuinfo" uselibs="rom utility"
+    version=$(AROS_TARGET_PLATFORM) files="init getcpuinfo"
--- a/rom/usb/classes/asixeth/mmakefile.src
+++ b/rom/usb/classes/asixeth/mmakefile.src
@ -9,7 +9,6 @@ FILES :=    asixeth.class dev debug

 %build_module mmake=kernel-usb-classes-asixeth \
    modname=asixeth modtype=usbclass modsuffix="class" \
-    files="$(FILES)" \
-    uselibs="amiga rom"
+    files="$(FILES)"

 %common
--- a/rom/usb/classes/audio/mmakefile.src
+++ b/rom/usb/classes/audio/mmakefile.src
@ -11,6 +11,6 @@ FILES :=    usbaudio.class numtostr debug
 %build_module mmake=kernel-usb-classes-usbaudio \
    modname=usbaudio modtype=usbclass modsuffix="class" \
    files="$(FILES)" \
-    uselibs="amiga rom debug"
+    uselibs="debug"

 %common
--- a/rom/usb/classes/bluetooth/mmakefile.src
+++ b/rom/usb/classes/bluetooth/mmakefile.src
@ -9,7 +9,6 @@ FILES :=    bluetooth.class dev debug

 %build_module mmake=kernel-usb-classes-bluetooth \
    modname=bluetooth modtype=usbclass modsuffix="class" \
-    files="$(FILES)" \
-    uselibs="amiga rom"
+    files="$(FILES)"

 %common
--- a/rom/usb/classes/bootkeyboard/mmakefile.src
+++ b/rom/usb/classes/bootkeyboard/mmakefile.src
@ -9,7 +9,6 @@ FILES :=    bootkeyboard.class debug

 %build_module mmake=kernel-usb-classes-bootkeyboard \
    modname=bootkeyboard modtype=usbclass modsuffix="class" \
-    files="$(FILES)" \
-    uselibs="amiga rom"
+    files="$(FILES)"

 %common
--- a/rom/usb/classes/bootmouse/mmakefile.src
+++ b/rom/usb/classes/bootmouse/mmakefile.src
@ -9,7 +9,6 @@ FILES :=    bootmouse.class debug

 %build_module mmake=kernel-usb-classes-bootmouse \
    modname=bootmouse modtype=usbclass modsuffix="class" \
-    files="$(FILES)" \
-    uselibs="amiga rom"
+    files="$(FILES)"

 %common
--- a/rom/usb/classes/camdmidi/mmakefile.src
+++ b/rom/usb/classes/camdmidi/mmakefile.src
@ -9,7 +9,6 @@ FILES :=    camdusbmidi.class debug

 %build_module mmake=kernel-usb-classes-camdusbmidi \
    modname=camdusbmidi modtype=usbclass modsuffix="class" \
-    files="$(FILES)" \
-    uselibs="amiga rom"
+    files="$(FILES)"

 %common
--- a/rom/usb/classes/cdcacm/mmakefile.src
+++ b/rom/usb/classes/cdcacm/mmakefile.src
@ -7,7 +7,6 @@ FILES :=    cdcacm.class dev debug

 %build_module mmake=kernel-usb-classes-cdcacm \
    modname=cdcacm modtype=usbclass modsuffix="class" \
-    files="$(FILES)" \
-    uselibs="amiga rom"
+    files="$(FILES)"

 %common
--- a/Show More
+++ b/Show More