From 7e210445b4ac3ac67b5271ce833999c1e9ba3759 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Sun, 10 Jul 2011 18:37:26 +0000 Subject: [PATCH] build: Revert all uselibs= changes They were worse than useless, as the 'standard set of libraries' should always be linked in. 'What is that standard set?' is a good question. Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@39981 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-hosted/hidd/x11/mmakefile.src | 2 +- compiler/clib/mmakefile.src | 9 ++------- rom/devs/filesys/SFS/SFSdefrag/mmakefile.src | 2 +- rom/devs/filesys/SFS/SFSdefragmentGUI/mmakefile.src | 2 +- test/Zune/mmakefile.src | 2 +- test/benchmarks/boopsi/mmakefile.src | 2 +- test/benchmarks/graphics/mmakefile.src | 2 +- test/mmakefile.src | 2 +- workbench/c/Decoration/mmakefile.src | 2 +- workbench/c/Identify/mmakefile.src | 2 +- workbench/c/LoadResource/mmakefile.src | 2 +- workbench/c/Partition/mmakefile.src | 2 +- workbench/c/mmakefile.src | 4 ++-- workbench/classes/datatypes/8svx/mmakefile.src | 2 +- workbench/classes/datatypes/amigaguide/mmakefile.src | 2 +- workbench/classes/datatypes/ascii/mmakefile.src | 2 +- workbench/classes/datatypes/binary/mmakefile.src | 2 +- workbench/classes/datatypes/bmp/mmakefile.src | 2 +- workbench/classes/datatypes/gif/mmakefile.src | 2 +- workbench/classes/datatypes/html/mmakefile.src | 2 +- workbench/classes/datatypes/ilbm/mmakefile.src | 2 +- workbench/classes/datatypes/jpeg/mmakefile.src | 2 +- workbench/classes/datatypes/picture/mmakefile.src | 2 +- workbench/classes/datatypes/picture/picture.conf | 1 - workbench/classes/datatypes/png/mmakefile.src | 2 +- workbench/classes/datatypes/pnm/mmakefile.src | 2 +- workbench/classes/datatypes/sound/mmakefile.src | 2 +- workbench/classes/datatypes/text/mmakefile.src | 2 +- workbench/classes/datatypes/text/text.conf | 1 - workbench/classes/gadgets/aroscheckbox/mmakefile.src | 2 +- workbench/classes/gadgets/aroscycle/mmakefile.src | 2 +- workbench/classes/gadgets/aroslist/mmakefile.src | 2 +- workbench/classes/gadgets/aroslistview/mmakefile.src | 2 +- workbench/classes/gadgets/arosmutualexclude/mmakefile.src | 2 +- workbench/classes/gadgets/arospalette/mmakefile.src | 2 +- workbench/classes/gadgets/colorwheel/mmakefile.src | 2 +- workbench/classes/gadgets/gradientslider/mmakefile.src | 2 +- workbench/classes/zune/aboutwindow/mmakefile.src | 2 +- workbench/classes/zune/busy/mmakefile.src | 2 +- workbench/classes/zune/calendar/mmakefile.src | 2 +- workbench/classes/zune/clock/mmakefile.src | 2 +- workbench/classes/zune/iconimage/mmakefile.src | 2 +- workbench/classes/zune/lamp/mmakefile.src | 2 +- workbench/classes/zune/prefseditor/mmakefile.src | 2 +- workbench/classes/zune/prefswindow/mmakefile.src | 2 +- workbench/classes/zune/systemprefswindow/mmakefile.src | 2 +- workbench/classes/zune/texteditor/mcc/mmakefile.src | 2 +- workbench/devs/audio/mmakefile.src | 2 +- workbench/devs/clipboard/mmakefile.src | 2 +- workbench/devs/mmakefile.src | 4 ++-- workbench/devs/monitors/IntelGMA/mmakefile.src | 2 +- workbench/devs/monitors/wrapper/mmakefile.src | 2 +- workbench/devs/networks/ppp/ModemManager/mmakefile.src | 2 +- workbench/devs/networks/ppp/mmakefile.src | 2 +- workbench/hidds/hidd.i2c/mmakefile.src | 2 +- workbench/hidds/hidd.softpipe/mmakefile.src | 2 +- workbench/libs/asl/mmakefile.src | 2 +- workbench/libs/cgfx/mmakefile.src | 2 +- workbench/libs/commodities/mmakefile.src | 2 +- workbench/libs/coolimages/mmakefile.src | 2 +- workbench/libs/freetype/src/mmakefile.src | 2 +- workbench/libs/prometheus/mmakefile.src | 2 +- 62 files changed, 63 insertions(+), 70 deletions(-) diff --git a/arch/all-hosted/hidd/x11/mmakefile.src b/arch/all-hosted/hidd/x11/mmakefile.src index 6b6d499720..ba0bf3d97d 100644 --- a/arch/all-hosted/hidd/x11/mmakefile.src +++ b/arch/all-hosted/hidd/x11/mmakefile.src @@ -8,7 +8,7 @@ DISK_EXEDIR := $(AROS_DEVS)/Monitors %build_prog mmake=devs-monitors-x11 \ progname=X11 targetdir=$(DISK_EXEDIR) \ - files=$(DISK_FILES) uselibs="oop icon" + files=$(DISK_FILES) uselibs="oop" USER_CFLAGS = -DHOST_OS_$(ARCH) -isystem $(GENINCDIR) $(HOST_X11_CFLAGS) $(KERNEL_INCLUDES) ## The '-Wno-attributes' is here due to a gcc 4.5.x bug diff --git a/compiler/clib/mmakefile.src b/compiler/clib/mmakefile.src index 697e16fcab..5f4b604d26 100644 --- a/compiler/clib/mmakefile.src +++ b/compiler/clib/mmakefile.src @@ -517,12 +517,7 @@ DEP_LIBS := arosm autoinit arossupport #MM- linklibs-core : linklibs-clib #MM- linklibs : linklibs-clib #MM linklibs-clib : setup-clib includes linklibs-mlib linklibs-autoinit \ -#MM clib-stubs linklibs-amiga linklibs-arossupport \ -#MM linklibs-aros \ -#MM linklibs-dos \ -#MM linklibs-locale \ -#MM linklibs-dos \ -#MM linklibs-intuition +#MM clib-stubs linklibs-amiga linklibs-arossupport #MM linklibs-clib32 : includes @@ -553,7 +548,7 @@ $(AROS_LIBS)/$(MODULE) : $(MODULE_OBJ) $(OBJDIR)/libarosccommon.a objs="$(OBJDIR)/shared/arosc_init.o $(OBJDIR)/shared/arosc_functable.o $(MODULE_OBJ)" \ endtag="$(OBJDIR)/shared/arosc_endtag.o" \ ldflags="$(LDFLAGS) -L$(OBJDIR)" \ - libs="$(LIBS) -larosccommon -laros -ldos -llocale -lautoinit -ldos -lintuition" + libs="$(LIBS) -larosccommon" $(OBJDIR)/static/%.o : %.c %compile_q opt="$(CFLAGS) -DAROSC_STATIC" diff --git a/rom/devs/filesys/SFS/SFSdefrag/mmakefile.src b/rom/devs/filesys/SFS/SFSdefrag/mmakefile.src index c3f8b15c94..1c51656890 100644 --- a/rom/devs/filesys/SFS/SFSdefrag/mmakefile.src +++ b/rom/devs/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 graphics intuition locale amiga arosc m" + files=$(FILES) uselibs="mui amiga arosc m" %common diff --git a/rom/devs/filesys/SFS/SFSdefragmentGUI/mmakefile.src b/rom/devs/filesys/SFS/SFSdefragmentGUI/mmakefile.src index f226c50ebd..c2b013e056 100644 --- a/rom/devs/filesys/SFS/SFSdefragmentGUI/mmakefile.src +++ b/rom/devs/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="graphics intuition arossupport amiga arosc m" + uselibs="arossupport amiga arosc m" %common diff --git a/test/Zune/mmakefile.src b/test/Zune/mmakefile.src index 56ae4c8ae3..2e123a964c 100644 --- a/test/Zune/mmakefile.src +++ b/test/Zune/mmakefile.src @@ -34,4 +34,4 @@ EXEDIR := $(AROS_TESTS)/Zune %build_progs mmake=test-zune \ files=$(FILES) targetdir=$(EXEDIR) \ - uselibs="intuition mui arossupport amiga" + uselibs="mui arossupport amiga arosc" diff --git a/test/benchmarks/boopsi/mmakefile.src b/test/benchmarks/boopsi/mmakefile.src index b5e27105ee..48cbcd9d06 100644 --- a/test/benchmarks/boopsi/mmakefile.src +++ b/test/benchmarks/boopsi/mmakefile.src @@ -13,6 +13,6 @@ EXEDIR := $(AROS_TESTS)/benchmarks/boopsi %build_progs mmake=test-benchmarks-boopsi \ files=$(FILES) targetdir=$(EXEDIR) \ - uselibs="intuition muimaster arossupport amiga arosc m" + uselibs="arossupport amiga arosc m" %common diff --git a/test/benchmarks/graphics/mmakefile.src b/test/benchmarks/graphics/mmakefile.src index cc70af295f..488a880e62 100644 --- a/test/benchmarks/graphics/mmakefile.src +++ b/test/benchmarks/graphics/mmakefile.src @@ -13,6 +13,6 @@ EXEDIR := $(AROS_TESTS)/benchmarks/graphics %build_progs mmake=test-benchmarks-graphics \ files=$(FILES) targetdir=$(EXEDIR) \ - uselibs="amiga arosc graphics cybergraphics intuition diskfont m" + uselibs="amiga arosc m" %common diff --git a/test/mmakefile.src b/test/mmakefile.src index 81061b9e83..d75ad016f2 100644 --- a/test/mmakefile.src +++ b/test/mmakefile.src @@ -109,7 +109,7 @@ USER_INCLUDES := -I$(SRCDIR)/workbench/libs %build_progs mmake=test \ files=$(COMMONTESTFILES) targetdir=$(EXEDIR) \ - uselibs="version coolimagesstatic graphics intuition utility cybergraphics commodities arossupport amiga arosc m hiddstubs oop" + uselibs="coolimagesstatic arossupport amiga arosc m hiddstubs oop" %copy_files_q mmake=test-testscript files="testscript" dst=$(EXEDIR) diff --git a/workbench/c/Decoration/mmakefile.src b/workbench/c/Decoration/mmakefile.src index 59cde98368..ad900dd3a8 100644 --- a/workbench/c/Decoration/mmakefile.src +++ b/workbench/c/Decoration/mmakefile.src @@ -20,6 +20,6 @@ EXEDIR := $(AROS_C) %build_prog mmake=workbench-c-decoration \ progname=Decoration targetdir=$(EXEDIR) \ - files=$(FILES) uselibs="cybergraphics graphics datatypes intuition utility arossupport amiga arosc m" \ + files=$(FILES) uselibs="arossupport amiga arosc m" \ detach=yes %common diff --git a/workbench/c/Identify/mmakefile.src b/workbench/c/Identify/mmakefile.src index 423697b327..75ccf7b945 100644 --- a/workbench/c/Identify/mmakefile.src +++ b/workbench/c/Identify/mmakefile.src @@ -9,7 +9,7 @@ FILES := main %build_prog mmake=workbench-c-identify \ progname=Identify targetdir=$(AROS_C) \ - files=$(FILES) uselibs="amiga datatypes" + files=$(FILES) uselibs="amiga" %common diff --git a/workbench/c/LoadResource/mmakefile.src b/workbench/c/LoadResource/mmakefile.src index 741309f0d7..f5b2a49143 100644 --- a/workbench/c/LoadResource/mmakefile.src +++ b/workbench/c/LoadResource/mmakefile.src @@ -10,6 +10,6 @@ FILES := main locale %build_prog mmake=workbench-c-loadresource \ progname=LoadResource targetdir=$(AROS_C) \ - files=$(FILES) uselibs="locale" + files=$(FILES) uselibs="" %common diff --git a/workbench/c/Partition/mmakefile.src b/workbench/c/Partition/mmakefile.src index 2a62d8d643..d03e679dc8 100644 --- a/workbench/c/Partition/mmakefile.src +++ b/workbench/c/Partition/mmakefile.src @@ -10,6 +10,6 @@ FILES := main args %build_prog mmake=workbench-c-partition \ progname=Partition targetdir=$(AROS_C) \ - files=$(FILES) uselibs="partition utility amiga arosc m" + files=$(FILES) uselibs="amiga arosc m" %common diff --git a/workbench/c/mmakefile.src b/workbench/c/mmakefile.src index 2ca6ae25eb..fbb114b587 100644 --- a/workbench/c/mmakefile.src +++ b/workbench/c/mmakefile.src @@ -81,7 +81,7 @@ USER_CFLAGS := -I$(SRCDIR)/rom/dos -DADATE="\"$(shell date "+%d.%m.%Y")\"" %build_progs mmake=workbench-c \ files=$(FILES) targetdir=$(AROS_C) \ - uselibs="arossupport debug asl diskfont partition utility iffparse intuition graphics dos icon locale amiga m" + uselibs="arossupport amiga arosc m debug" %build_progs mmake=workbench-c-pure \ files=$(PURE_FILES) targetdir=$(AROS_C) \ @@ -89,7 +89,7 @@ USER_CFLAGS := -I$(SRCDIR)/rom/dos -DADATE="\"$(shell date "+%d.%m.%Y")\"" %build_prog mmake=workbench-c-requeststring progname=RequestString \ files=RequestString targetdir=$(AROS_C) \ - uselibs="mui intuition dos muimaster arossupport amiga rom" + uselibs="arossupport amiga rom mui" $(OBJDIR)/evalParser.tab.c : evalParser.y @$(ECHO) Generating $(notdir $@) from $<... diff --git a/workbench/classes/datatypes/8svx/mmakefile.src b/workbench/classes/datatypes/8svx/mmakefile.src index 49d83b067d..553e4c62f9 100644 --- a/workbench/classes/datatypes/8svx/mmakefile.src +++ b/workbench/classes/datatypes/8svx/mmakefile.src @@ -9,4 +9,4 @@ USER_CFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-8svx \ modname=8svx modtype=datatype \ - files=$(FILES) uselibs="dos datatypes iffparse intuition" + files=$(FILES) diff --git a/workbench/classes/datatypes/amigaguide/mmakefile.src b/workbench/classes/datatypes/amigaguide/mmakefile.src index 7eac8d8178..b48e12bde7 100644 --- a/workbench/classes/datatypes/amigaguide/mmakefile.src +++ b/workbench/classes/datatypes/amigaguide/mmakefile.src @@ -10,4 +10,4 @@ USER_CFLAGS := -DCOMPILE_DATATYPE -DMORPHOS_AG_EXTENSION -I$(SRCDIR)/$(CURDIR) %build_module mmake=workbench-datatypes-amigaguide \ modname=amigaguide modtype=datatype \ - files=$(FILES) uselibs="rexxsyslib dos datatypes diskfont graphics intuition layers utility amiga rom" + files=$(FILES) uselibs="rexxsyslib amiga rom" diff --git a/workbench/classes/datatypes/ascii/mmakefile.src b/workbench/classes/datatypes/ascii/mmakefile.src index 362c614868..84f51744bd 100644 --- a/workbench/classes/datatypes/ascii/mmakefile.src +++ b/workbench/classes/datatypes/ascii/mmakefile.src @@ -7,5 +7,5 @@ FILES := asciiclass %build_module mmake=workbench-datatypes-ascii \ modname=ascii modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics intuition text" + files=$(FILES) diff --git a/workbench/classes/datatypes/binary/mmakefile.src b/workbench/classes/datatypes/binary/mmakefile.src index 291fe13071..a708276604 100644 --- a/workbench/classes/datatypes/binary/mmakefile.src +++ b/workbench/classes/datatypes/binary/mmakefile.src @@ -7,5 +7,5 @@ FILES := binaryclass %build_module mmake=workbench-datatypes-binary \ modname=binary modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics intuition text" + files=$(FILES) diff --git a/workbench/classes/datatypes/bmp/mmakefile.src b/workbench/classes/datatypes/bmp/mmakefile.src index 92467c81bf..91624ac69e 100644 --- a/workbench/classes/datatypes/bmp/mmakefile.src +++ b/workbench/classes/datatypes/bmp/mmakefile.src @@ -9,4 +9,4 @@ USER_CFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-bmp \ modname=bmp modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics intuition picture" + files=$(FILES) diff --git a/workbench/classes/datatypes/gif/mmakefile.src b/workbench/classes/datatypes/gif/mmakefile.src index 8e72702865..0cf4b61e36 100644 --- a/workbench/classes/datatypes/gif/mmakefile.src +++ b/workbench/classes/datatypes/gif/mmakefile.src @@ -9,5 +9,5 @@ USER_CFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-gif \ modname=gif modtype=datatype \ - files=$(FILES) uselibs="dos datatypes intuition picture" + files=$(FILES) diff --git a/workbench/classes/datatypes/html/mmakefile.src b/workbench/classes/datatypes/html/mmakefile.src index a8a3b55aa2..3b41d1ac9b 100644 --- a/workbench/classes/datatypes/html/mmakefile.src +++ b/workbench/classes/datatypes/html/mmakefile.src @@ -7,4 +7,4 @@ FILES := htmlclass tables parse layout %build_module mmake=workbench-datatypes-html \ modname=html modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics intuition rom amiga" + files=$(FILES) uselibs="rom amiga" diff --git a/workbench/classes/datatypes/ilbm/mmakefile.src b/workbench/classes/datatypes/ilbm/mmakefile.src index 033188cea0..88d2c72ff6 100644 --- a/workbench/classes/datatypes/ilbm/mmakefile.src +++ b/workbench/classes/datatypes/ilbm/mmakefile.src @@ -9,5 +9,5 @@ USER_CFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-ilbm \ modname=ilbm modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics iffparse intuition picture" + files=$(FILES) diff --git a/workbench/classes/datatypes/jpeg/mmakefile.src b/workbench/classes/datatypes/jpeg/mmakefile.src index 573bd1dc77..1c1f5727d7 100644 --- a/workbench/classes/datatypes/jpeg/mmakefile.src +++ b/workbench/classes/datatypes/jpeg/mmakefile.src @@ -12,7 +12,7 @@ USER_CFLAGS := -DAROS_LC_SETFUNCS %build_module mmake=workbench-datatypes-jpeg \ modname=jpeg modtype=datatype \ - files=$(FILES) uselibs="jpeg dos datatypes intuition amiga rom m" + files=$(FILES) uselibs="jpeg amiga rom m" $(MOD_DIR)/jpeg.readme : jpeg.readme @$(CP) $< $@ diff --git a/workbench/classes/datatypes/picture/mmakefile.src b/workbench/classes/datatypes/picture/mmakefile.src index b7ae5d88ef..d46248cf4a 100644 --- a/workbench/classes/datatypes/picture/mmakefile.src +++ b/workbench/classes/datatypes/picture/mmakefile.src @@ -9,5 +9,5 @@ USER_CFLAGS := -DCOMPILE_DATATYPE -DMYDEBUG %build_module mmake=workbench-datatypes-picture \ modname=picture modtype=datatype \ - files=$(FILES) uselibs="amiga rom cybergraphics dos graphics intuition datatypes utility" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/datatypes/picture/picture.conf b/workbench/classes/datatypes/picture/picture.conf index e7c89dbe68..413dd67305 100644 --- a/workbench/classes/datatypes/picture/picture.conf +++ b/workbench/classes/datatypes/picture/picture.conf @@ -1,7 +1,6 @@ ##begin config version 41.0 classdatatype struct Picture_Data -options autoinit ##end config ##begin cdefprivate #include "pictureclass.h" diff --git a/workbench/classes/datatypes/png/mmakefile.src b/workbench/classes/datatypes/png/mmakefile.src index db69a33e57..e38495e90c 100644 --- a/workbench/classes/datatypes/png/mmakefile.src +++ b/workbench/classes/datatypes/png/mmakefile.src @@ -10,4 +10,4 @@ USER_CFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-png \ modname=png modtype=datatype \ - files=$(FILES) uselibs="png_nostdio z dos datatypes intuition amiga rom m" + files=$(FILES) uselibs="png_nostdio amiga z rom m" diff --git a/workbench/classes/datatypes/pnm/mmakefile.src b/workbench/classes/datatypes/pnm/mmakefile.src index e129de9ab1..faf7a9837f 100644 --- a/workbench/classes/datatypes/pnm/mmakefile.src +++ b/workbench/classes/datatypes/pnm/mmakefile.src @@ -7,4 +7,4 @@ FILES := pnmclass %build_module mmake=workbench-datatypes-pnm \ modname=pnm modtype=datatype \ - files=$(FILES) uselibs="dos datatypes intuition amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/datatypes/sound/mmakefile.src b/workbench/classes/datatypes/sound/mmakefile.src index 2c69009383..7a38b4ddaa 100644 --- a/workbench/classes/datatypes/sound/mmakefile.src +++ b/workbench/classes/datatypes/sound/mmakefile.src @@ -9,5 +9,5 @@ USER_CFLAGS := -I$(GENDIR)/workbench/devs/AHI/Include/gcc %build_module mmake=workbench-datatypes-sound \ modname=sound modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics iffparse intuition utility amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/datatypes/text/mmakefile.src b/workbench/classes/datatypes/text/mmakefile.src index 1a7de24295..4ee4445b81 100644 --- a/workbench/classes/datatypes/text/mmakefile.src +++ b/workbench/classes/datatypes/text/mmakefile.src @@ -9,4 +9,4 @@ USER_CFLAGS := -DCOMPILE_DATATYPE -DMORPHOS_AG_EXTENSION %build_module mmake=workbench-datatypes-text \ modname=text modtype=datatype \ - files=$(FILES) uselibs="dos datatypes graphics iffparse intuition layers utility amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/datatypes/text/text.conf b/workbench/classes/datatypes/text/text.conf index 7e388738d6..3b849ef0ae 100644 --- a/workbench/classes/datatypes/text/text.conf +++ b/workbench/classes/datatypes/text/text.conf @@ -1,7 +1,6 @@ ##begin config version 50.2 classdatatype struct Text_Data -options autoinit ##end config ##begin cdef #include diff --git a/workbench/classes/gadgets/aroscheckbox/mmakefile.src b/workbench/classes/gadgets/aroscheckbox/mmakefile.src index ad27d9b4f2..f754bea038 100644 --- a/workbench/classes/gadgets/aroscheckbox/mmakefile.src +++ b/workbench/classes/gadgets/aroscheckbox/mmakefile.src @@ -7,5 +7,5 @@ FILES := checkboxclass support %build_module mmake=workbench-gadgets-aroscheckbox \ modname=aroscheckbox modtype=gadget \ - files=$(FILES) uselibs="graphics intuition utility amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/gadgets/aroscycle/mmakefile.src b/workbench/classes/gadgets/aroscycle/mmakefile.src index d4c769fbd9..3791a2acfb 100644 --- a/workbench/classes/gadgets/aroscycle/mmakefile.src +++ b/workbench/classes/gadgets/aroscycle/mmakefile.src @@ -7,5 +7,5 @@ FILES := cycleclass support %build_module mmake=workbench-gadgets-aroscycle \ modname=aroscycle modtype=gadget \ - files=$(FILES) uselibs="graphics intuition utility rom" + files=$(FILES) uselibs=rom diff --git a/workbench/classes/gadgets/aroslist/mmakefile.src b/workbench/classes/gadgets/aroslist/mmakefile.src index 91659a08f3..1fd8ce5120 100644 --- a/workbench/classes/gadgets/aroslist/mmakefile.src +++ b/workbench/classes/gadgets/aroslist/mmakefile.src @@ -7,5 +7,5 @@ FILES := listclass helpfuncs %build_module mmake=workbench-gadgets-aroslist \ modname=aroslist modtype=gadget \ - files=$(FILES) uselibs="intuition utility amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/gadgets/aroslistview/mmakefile.src b/workbench/classes/gadgets/aroslistview/mmakefile.src index 6325c001f4..cf2860ece0 100644 --- a/workbench/classes/gadgets/aroslistview/mmakefile.src +++ b/workbench/classes/gadgets/aroslistview/mmakefile.src @@ -7,5 +7,5 @@ FILES := listviewclass helpfuncs %build_module mmake=workbench-gadgets-aroslistview \ modname=aroslistview modtype=gadget \ - files=$(FILES) uselibs="dos graphics intuition utility amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/gadgets/arosmutualexclude/mmakefile.src b/workbench/classes/gadgets/arosmutualexclude/mmakefile.src index 2548eb18d2..605f7f539c 100644 --- a/workbench/classes/gadgets/arosmutualexclude/mmakefile.src +++ b/workbench/classes/gadgets/arosmutualexclude/mmakefile.src @@ -7,5 +7,5 @@ FILES := mxclass support %build_module mmake=workbench-gadgets-arosmutualexclude \ modname=arosmutualexclude modtype=gadget \ - files=$(FILES) uselibs="graphics intuition utility rom" + files=$(FILES) uselibs=rom diff --git a/workbench/classes/gadgets/arospalette/mmakefile.src b/workbench/classes/gadgets/arospalette/mmakefile.src index d8baf70e87..32024e7891 100644 --- a/workbench/classes/gadgets/arospalette/mmakefile.src +++ b/workbench/classes/gadgets/arospalette/mmakefile.src @@ -7,4 +7,4 @@ FILES := paletteclass support %build_module mmake=workbench-gadgets-arospalette \ modname=arospalette modtype=gadget \ - files=$(FILES) uselibs="graphics intuition utility rom" + files=$(FILES) uselibs=rom diff --git a/workbench/classes/gadgets/colorwheel/mmakefile.src b/workbench/classes/gadgets/colorwheel/mmakefile.src index 22a3e74842..4e9aef93af 100644 --- a/workbench/classes/gadgets/colorwheel/mmakefile.src +++ b/workbench/classes/gadgets/colorwheel/mmakefile.src @@ -17,4 +17,4 @@ FUNCS := \ %build_module mmake=workbench-gadgets-colorwheel \ modname=colorwheel modtype=gadget \ - files="$(FUNCS) $(FILES)" uselibs="cybergraphics graphics intuition layers utility amiga m rom" + files="$(FUNCS) $(FILES)" uselibs="amiga m rom" diff --git a/workbench/classes/gadgets/gradientslider/mmakefile.src b/workbench/classes/gadgets/gradientslider/mmakefile.src index eba08e52d8..7ac4b0c66e 100644 --- a/workbench/classes/gadgets/gradientslider/mmakefile.src +++ b/workbench/classes/gadgets/gradientslider/mmakefile.src @@ -7,4 +7,4 @@ FILES := gradientsliderclass support %build_module mmake=workbench-gadgets-gradientslider \ modname=gradientslider modtype=gadget \ - files=$(FILES) uselibs="cybergraphics graphics intuition utility amiga rom" + files=$(FILES) uselibs="amiga rom" diff --git a/workbench/classes/zune/aboutwindow/mmakefile.src b/workbench/classes/zune/aboutwindow/mmakefile.src index 1324107639..9a515da7d2 100644 --- a/workbench/classes/zune/aboutwindow/mmakefile.src +++ b/workbench/classes/zune/aboutwindow/mmakefile.src @@ -10,7 +10,7 @@ INCLUDE_FILES := aboutwindow.h mmake=workbench-classes-zune-aboutwindow \ modname=AboutWindow modtype=mcc \ conffile=aboutwindow.conf \ - uselibs="dos intuition locale muimaster utility amiga rom" + uselibs="amiga rom" %copy_includes path=zune diff --git a/workbench/classes/zune/busy/mmakefile.src b/workbench/classes/zune/busy/mmakefile.src index ca0be58299..5f592c25c3 100644 --- a/workbench/classes/zune/busy/mmakefile.src +++ b/workbench/classes/zune/busy/mmakefile.src @@ -11,7 +11,7 @@ INCLUDE_FILES := Busy_mcc.h mmake=workbench-classes-zune-busy \ modname=Busy modtype=mcc \ conffile=busy.conf \ - uselibs="muimaster graphics utility amiga m rom" + uselibs="amiga m rom" %copy_includes path=mui diff --git a/workbench/classes/zune/calendar/mmakefile.src b/workbench/classes/zune/calendar/mmakefile.src index 0591d11b38..720d9e98a2 100644 --- a/workbench/classes/zune/calendar/mmakefile.src +++ b/workbench/classes/zune/calendar/mmakefile.src @@ -12,7 +12,7 @@ INCLUDE_FILES := calendar.h mmake=workbench-classes-zune-calendar \ modname=Calendar modtype=mcc \ conffile=calendar.conf \ - uselibs="graphics intuition locale muimaster utility amiga rom m" + uselibs="amiga rom m" %copy_includes path=zune diff --git a/workbench/classes/zune/clock/mmakefile.src b/workbench/classes/zune/clock/mmakefile.src index 1bad6b9b15..4d97e66c08 100644 --- a/workbench/classes/zune/clock/mmakefile.src +++ b/workbench/classes/zune/clock/mmakefile.src @@ -11,7 +11,7 @@ INCLUDE_FILES := clock.h mmake=workbench-classes-zune-clock \ modname=Clock modtype=mcc \ conffile=clock.conf \ - uselibs="graphics intuition muimaster utility amiga m rom" + uselibs="amiga m rom" %copy_includes path=zune diff --git a/workbench/classes/zune/iconimage/mmakefile.src b/workbench/classes/zune/iconimage/mmakefile.src index 2b5ee2b553..b0b74ad380 100644 --- a/workbench/classes/zune/iconimage/mmakefile.src +++ b/workbench/classes/zune/iconimage/mmakefile.src @@ -10,7 +10,7 @@ INCLUDE_FILES := iconimage.h mmake=workbench-classes-zune-iconimage \ modname=IconImage modtype=mcc \ conffile=iconimage.conf \ - uselibs="icon intuition muimaster utility amiga rom" + uselibs="amiga rom" %copy_includes path=zune diff --git a/workbench/classes/zune/lamp/mmakefile.src b/workbench/classes/zune/lamp/mmakefile.src index 5d00614400..bbd037215f 100644 --- a/workbench/classes/zune/lamp/mmakefile.src +++ b/workbench/classes/zune/lamp/mmakefile.src @@ -16,7 +16,7 @@ INCLUDE_FILES := Lamp_mcc.h mmake=workbench-classes-zune-lamp \ modname=Lamp modtype=mcc \ conffile=lamp.conf \ - uselibs="graphics intuition muimaster utility amiga rom" + uselibs="amiga rom" %copy_includes path=mui diff --git a/workbench/classes/zune/prefseditor/mmakefile.src b/workbench/classes/zune/prefseditor/mmakefile.src index aa2205be6c..406ac6c1b1 100644 --- a/workbench/classes/zune/prefseditor/mmakefile.src +++ b/workbench/classes/zune/prefseditor/mmakefile.src @@ -12,7 +12,7 @@ INCLUDE_FILES := prefseditor.h mmake=workbench-classes-zune-prefseditor \ modname=PrefsEditor modtype=mcc \ conffile=prefseditor.conf \ - uselibs="dos intuition muimaster utility amiga rom m" + uselibs="amiga rom m" %copy_includes path=zune diff --git a/workbench/classes/zune/prefswindow/mmakefile.src b/workbench/classes/zune/prefswindow/mmakefile.src index 2a003d8d5c..5252f7ba96 100644 --- a/workbench/classes/zune/prefswindow/mmakefile.src +++ b/workbench/classes/zune/prefswindow/mmakefile.src @@ -12,7 +12,7 @@ INCLUDE_FILES := prefswindow.h mmake=workbench-classes-zune-prefswindow \ modname=PrefsWindow modtype=mcc \ conffile=prefswindow.conf \ - uselibs="intuition locale muimaster utility amiga rom" + uselibs="amiga rom" %copy_includes path=zune diff --git a/workbench/classes/zune/systemprefswindow/mmakefile.src b/workbench/classes/zune/systemprefswindow/mmakefile.src index 49411f63a7..b57ec43e02 100644 --- a/workbench/classes/zune/systemprefswindow/mmakefile.src +++ b/workbench/classes/zune/systemprefswindow/mmakefile.src @@ -12,7 +12,7 @@ INCLUDE_FILES := systemprefswindow.h mmake=workbench-classes-zune-systemprefswindow \ modname=SystemPrefsWindow modtype=mcc \ conffile=systemprefswindow.conf \ - uselibs="asl dos icon intuition locale muimaster utility amiga rom" + uselibs="amiga rom" %copy_includes path=zune diff --git a/workbench/classes/zune/texteditor/mcc/mmakefile.src b/workbench/classes/zune/texteditor/mcc/mmakefile.src index db9899be5e..6cbf9363b6 100644 --- a/workbench/classes/zune/texteditor/mcc/mmakefile.src +++ b/workbench/classes/zune/texteditor/mcc/mmakefile.src @@ -43,7 +43,7 @@ FILES := library \ %build_module_simple mmake=workbench-classes-zune-texteditor-class \ modname=TextEditor modtype=mcc \ - files=$(FILES) uselibs="amiga mui rom m" + files=$(FILES) uselibs="rexxsyslib amiga mui rom m" #MM includes-copy diff --git a/workbench/devs/audio/mmakefile.src b/workbench/devs/audio/mmakefile.src index 33d73c9927..da9f794c5f 100644 --- a/workbench/devs/audio/mmakefile.src +++ b/workbench/devs/audio/mmakefile.src @@ -10,4 +10,4 @@ USER_CFLAGS := -I$(SRCDIR)/workbench/devs/AHI/Include/C %build_module mmake=workbench-devs-audio \ modname=audio modtype=device \ - files="$(FILES)" uselibs="dos hiddstubs rom" + files="$(FILES)" uselibs="hiddstubs rom" diff --git a/workbench/devs/clipboard/mmakefile.src b/workbench/devs/clipboard/mmakefile.src index 8ef8819bcb..cb8f02ffbc 100644 --- a/workbench/devs/clipboard/mmakefile.src +++ b/workbench/devs/clipboard/mmakefile.src @@ -6,4 +6,4 @@ include $(TOP)/config/make.cfg %build_module mmake=workbench-devs-clipboard \ modname=clipboard modtype=device \ - files=clipboard uselibs="dos amiga" + files=clipboard uselibs=amiga diff --git a/workbench/devs/mmakefile.src b/workbench/devs/mmakefile.src index 1d7d25e436..1b885b4e87 100644 --- a/workbench/devs/mmakefile.src +++ b/workbench/devs/mmakefile.src @@ -33,12 +33,12 @@ include $(TOP)/config/make.cfg %build_module mmake=workbench-devs-fdsk \ modname=fdsk modtype=device \ files=fdsk_device \ - uselibs="dos arossupport amiga rom" + uselibs="arossupport amiga rom" %build_module mmake=workbench-devs-ramdrive \ modname=ramdrive modtype=device \ files=ramdrive_device \ - uselibs="dos arossupport amiga rom" + uselibs="arossupport amiga rom" #MM workbench-devs-mountlist : $(AROS_DEVS)/Mountlist workbench-devs-dosdrivers diff --git a/workbench/devs/monitors/IntelGMA/mmakefile.src b/workbench/devs/monitors/IntelGMA/mmakefile.src index d0d2100fbb..b833b7b6f3 100644 --- a/workbench/devs/monitors/IntelGMA/mmakefile.src +++ b/workbench/devs/monitors/IntelGMA/mmakefile.src @@ -10,6 +10,6 @@ EXEDIR := $(AROSDIR)/Devs/Monitors %build_prog mmake=devs-monitors-intelgma \ progname=IntelGMA targetdir=$(EXEDIR) \ - files=$(FILES) uselibs="graphics icon oop hiddstubs" + files=$(FILES) uselibs="oop hiddstubs" %common diff --git a/workbench/devs/monitors/wrapper/mmakefile.src b/workbench/devs/monitors/wrapper/mmakefile.src index b0f782a4fd..bb6309f0a5 100644 --- a/workbench/devs/monitors/wrapper/mmakefile.src +++ b/workbench/devs/monitors/wrapper/mmakefile.src @@ -12,7 +12,7 @@ STORAGEDIR := $(AROSDIR)/Storage/Monitors %build_prog mmake=devs-monitors-wrapper \ progname=Wrapper targetdir=$(STORAGEDIR) \ - files=$(FILES) uselibs="oop graphics icon" + files=$(FILES) uselibs="oop" #MM devs-monitors-wrapper-copy: $(DEVSDIR)/ATI \ diff --git a/workbench/devs/networks/ppp/ModemManager/mmakefile.src b/workbench/devs/networks/ppp/ModemManager/mmakefile.src index 2ac854e71f..c0a66ea66a 100644 --- a/workbench/devs/networks/ppp/ModemManager/mmakefile.src +++ b/workbench/devs/networks/ppp/ModemManager/mmakefile.src @@ -10,5 +10,5 @@ EXEDIR := $(AROS_C) %build_prog mmake=devs-networks-drivers-ppp-mm \ progname=ModemManager targetdir=$(EXEDIR) \ - files=$(FILES) uselibs="mui graphics intuition muimaster arossupport amiga arosc m" + files=$(FILES) uselibs="arossupport amiga arosc m mui" %common diff --git a/workbench/devs/networks/ppp/mmakefile.src b/workbench/devs/networks/ppp/mmakefile.src index 1dd8c416b8..c38fe2da4f 100644 --- a/workbench/devs/networks/ppp/mmakefile.src +++ b/workbench/devs/networks/ppp/mmakefile.src @@ -9,4 +9,4 @@ FILES := init handler ppp serial %build_module mmake=devs-networks-drivers-ppp \ modname=ppp modtype=device \ - moduledir=Devs/Networks uselibs="dos utility arosc" + moduledir=Devs/Networks uselibs="arosc" diff --git a/workbench/hidds/hidd.i2c/mmakefile.src b/workbench/hidds/hidd.i2c/mmakefile.src index 804181ba48..44c4b14262 100644 --- a/workbench/hidds/hidd.i2c/mmakefile.src +++ b/workbench/hidds/hidd.i2c/mmakefile.src @@ -21,4 +21,4 @@ $(GENINCDIR)/hidd/i2c.h: include/i2c.h %build_module mmake=hidd-i2c \ modname=i2c modtype=hidd \ files="$(FILES)" \ - uselibs="oop utility rom amiga" + uselibs="oop rom amiga" diff --git a/workbench/hidds/hidd.softpipe/mmakefile.src b/workbench/hidds/hidd.softpipe/mmakefile.src index 38eea7cde6..ca038ae64a 100644 --- a/workbench/hidds/hidd.softpipe/mmakefile.src +++ b/workbench/hidds/hidd.softpipe/mmakefile.src @@ -54,6 +54,6 @@ USER_INCLUDES := \ -I$(GALLIUM_PATH)/include \ %build_module mmake=hidd-softpipe modname=softpipe modtype=hidd \ - files="$(SOFTPIPE_HIDD_SOURCES)" uselibs="oop galliumauxiliary dos graphics rom" + files="$(SOFTPIPE_HIDD_SOURCES)" uselibs="oop galliumauxiliary rom" %common diff --git a/workbench/libs/asl/mmakefile.src b/workbench/libs/asl/mmakefile.src index 5e457bb954..4c7428a14a 100644 --- a/workbench/libs/asl/mmakefile.src +++ b/workbench/libs/asl/mmakefile.src @@ -45,6 +45,6 @@ FUNCS := allocfilerequest \ %build_module mmake=workbench-libs-asl \ modname=asl modtype=library \ files="$(FUNCS) $(FILES)" \ - uselibs="dos diskfont gadtools graphics intuition layers locale utility cybergraphics coolimages amiga rom m" + uselibs="coolimages amiga rom m" %common diff --git a/workbench/libs/cgfx/mmakefile.src b/workbench/libs/cgfx/mmakefile.src index 1e9704ceb3..905a667210 100644 --- a/workbench/libs/cgfx/mmakefile.src +++ b/workbench/libs/cgfx/mmakefile.src @@ -40,7 +40,7 @@ FUNCS := \ %build_module mmake=workbench-libs-cgfx \ modname=cybergraphics modtype=library \ files="$(FUNCS) graphics_driver gfxfuncsupport cybergraphics_init" \ - uselibs="rom oop graphics utility" + uselibs="rom oop" #MM includes-copy diff --git a/workbench/libs/commodities/mmakefile.src b/workbench/libs/commodities/mmakefile.src index 37499fc75a..828c8ac548 100644 --- a/workbench/libs/commodities/mmakefile.src +++ b/workbench/libs/commodities/mmakefile.src @@ -44,6 +44,6 @@ FUNCS := activatecxobj \ %build_module mmake=workbench-libs-commodities \ modname=commodities modtype=library \ files="$(FUNCS) $(FILES) commodities_init" \ - uselibs="keymap utility arossupport rom" + uselibs="arossupport rom" %common diff --git a/workbench/libs/coolimages/mmakefile.src b/workbench/libs/coolimages/mmakefile.src index 0c3b2aa8b8..2a22f16527 100644 --- a/workbench/libs/coolimages/mmakefile.src +++ b/workbench/libs/coolimages/mmakefile.src @@ -12,6 +12,6 @@ include $(TOP)/config/make.cfg %build_module mmake=workbench-libs-coolimages \ modname=coolimages modtype=library \ files="coolimages_init cool_obtainimagea" \ - uselibs="coolimagesstatic cybergraphics graphics intuition utility amiga rom" + uselibs="coolimagesstatic amiga rom" %common diff --git a/workbench/libs/freetype/src/mmakefile.src b/workbench/libs/freetype/src/mmakefile.src index 96e2dfad14..90c700639c 100644 --- a/workbench/libs/freetype/src/mmakefile.src +++ b/workbench/libs/freetype/src/mmakefile.src @@ -67,5 +67,5 @@ USER_CFLAGS := -DFT2_BUILD_LIBRARY %build_module mmake=workbench-libs-freetype-module modname=freetype2 \ modtype=library files="$(SHFILES) $(FT2FILES)" linklibname=freetype2shared \ - uselibs="dos utility amiga rom m" + uselibs="amiga rom m" diff --git a/workbench/libs/prometheus/mmakefile.src b/workbench/libs/prometheus/mmakefile.src index 8090df931b..26351295ca 100644 --- a/workbench/libs/prometheus/mmakefile.src +++ b/workbench/libs/prometheus/mmakefile.src @@ -12,6 +12,6 @@ FILES := board %build_module mmake=workbench-libs-prometheus \ modname=prometheus modtype=library \ files="prometheus_init $(FILES)" \ - uselibs="utility oop amiga hiddstubs" + uselibs="oop amiga hiddstubs" %common -- 2.11.4.GIT