From 638bc526bac41e19cc483f55f5e4dd737a709111 Mon Sep 17 00:00:00 2001 From: wawa Date: Sat, 23 Feb 2019 09:58:02 +0000 Subject: [PATCH] clean up some makefile issues. (NicJA) git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@55720 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-android/kernel/mmakefile.src | 6 +- arch/all-darwin/hostdisk/mmakefile.src | 4 +- arch/all-hosted/filesys/emul_handler/mmakefile.src | 2 +- arch/all-hosted/hidd/x11/mmakefile.src | 6 +- arch/all-hosted/hostlib/mmakefile.src | 5 +- arch/all-hosted/libs/hostgl/mmakefile.src | 3 +- arch/all-ios/kernel/mmakefile.src | 6 +- arch/all-linux/hostdisk/mmakefile.src | 4 +- arch/all-mingw32/bootstrap/mmakefile.src | 2 +- arch/all-mingw32/filesys/emul_handler/emul_host.c | 75 +++++++++++----------- arch/all-native/econsole/mmakefile.src | 2 +- arch/all-pc/acpitool/mmakefile.src | 2 +- arch/all-pc/boot/grub2-tools/mmakefile.src | 3 +- arch/all-pc/bootstrap/mmakefile.src | 5 +- arch/all-pc/hpet/mmakefile.src | 2 +- arch/all-pc/processor/mmakefile.src | 2 +- arch/all-unix/battclock/mmakefile.src | 4 +- arch/all-unix/bootstrap/mmakefile.src | 10 +-- arch/all-unix/devs/hostdisk/mmakefile.src | 6 +- arch/all-unix/devs/networks/eth/mmakefile.src | 4 +- arch/all-unix/devs/networks/tap/mmakefile.src | 4 +- arch/all-unix/exec/mmakefile.src | 10 +-- arch/all-unix/filesys/emul_handler/mmakefile.src | 6 +- arch/all-unix/hidd/parallel/mmakefile.src | 4 +- arch/all-unix/hidd/serial/mmakefile.src | 4 +- arch/all-unix/hidd/unixio/mmakefile.src | 6 +- arch/all-unix/kernel/mmakefile.src | 6 +- arch/all-unix/libs/oss/mmakefile.src | 2 +- arch/all-unix/timer/mmakefile.src | 4 +- arch/arm-all/dos/mmakefile.src | 2 +- arch/arm-all/exec/mmakefile.src | 2 +- arch/arm-all/kernel/mmakefile.src | 3 +- arch/arm-efika/boot/mmakefile.src | 4 +- arch/arm-linux/processor/mmakefile.src | 3 +- arch/arm-native/ceboot/mmakefile.src | 3 +- arch/arm-native/exec/mmakefile.src | 6 +- arch/arm-native/processor/mmakefile.src | 2 +- .../soc/broadcom/2708/usb/poseidon/mmakefile.src | 2 +- arch/arm-raspi/boot/mmakefile.src | 4 +- arch/armeb-all/exec/mmakefile.src | 2 +- arch/armeb-raspi/boot/mmakefile.src | 4 +- arch/i386-all/exec/mmakefile.src | 2 +- arch/i386-all/hidd/gfx/mmakefile.src | 2 +- arch/i386-all/kernel/mmakefile.src | 3 +- arch/i386-all/stdc/mmakefile.src | 2 +- arch/i386-pc/exec/mmakefile.src | 2 +- arch/m68k-all/debug/mmakefile.src | 2 +- arch/m68k-all/dos/mmakefile.src | 6 +- arch/m68k-all/exec/mmakefile.src | 2 +- arch/m68k-all/m680x0/mmakefile.src | 3 +- arch/m68k-all/mathffp/mmakefile.src | 3 +- arch/m68k-all/mathieeedoubbas/mmakefile.src | 2 +- arch/m68k-all/mathieeedoubtrans/mmakefile.src | 2 +- arch/m68k-all/mathieeesingbas/mmakefile.src | 2 +- arch/m68k-all/mathieeesingtrans/mmakefile.src | 2 +- arch/m68k-all/posixc/mmakefile.src | 3 +- arch/m68k-all/processor/mmakefile.src | 2 +- arch/m68k-all/test/mmakefile.src | 2 +- arch/m68k-all/utility/mmakefile.src | 3 +- arch/m68k-amiga/boot/mmakefile.src | 7 +- arch/m68k-amiga/c/mmakefile.src | 7 +- arch/m68k-amiga/cia/mmakefile.src | 2 +- arch/m68k-amiga/devs/cd/mmakefile.src | 2 +- arch/m68k-amiga/diag/mmakefile.src | 2 +- arch/m68k-amiga/disk/mmakefile.src | 2 +- arch/m68k-amiga/exec/mmakefile.src | 5 +- arch/m68k-amiga/expansion/mmakefile.src | 4 +- arch/m68k-amiga/graphics/mmakefile.src | 4 +- arch/m68k-amiga/hidd/gfx/mmakefile.src | 2 +- arch/m68k-amiga/hidd/keyboard/mmakefile.src | 2 +- arch/m68k-amiga/hidd/mouse/mmakefile.src | 2 +- arch/m68k-amiga/hidd/parallel/mmakefile.src | 2 +- arch/m68k-amiga/kernel/mmakefile.src | 6 +- arch/m68k-amiga/romboot/mmakefile.src | 2 +- arch/m68k-amiga/wb.tag/mmakefile.src | 2 +- arch/m68k-mac/exec/mmakefile.src | 8 ++- arch/ppc-all/exec/mmakefile.src | 2 +- arch/ppc-all/kernel/mmakefile.src | 5 +- arch/ppc-all/prep/kernel/mmakefile.src | 2 +- arch/ppc-chrp/battclock/mmakefile.src | 3 +- arch/ppc-chrp/boot/openfirmware/src/mmakefile.src | 5 +- arch/ppc-chrp/exec/mmakefile.src | 6 +- arch/ppc-native/processor/mmakefile.src | 2 +- arch/ppc-sam440/ata/mmakefile.src | 2 +- arch/ppc-sam440/battclock/mmakefile.src | 3 +- arch/ppc-sam440/boot/parthenope/src/mmakefile.src | 4 +- arch/ppc-sam440/debug/mmakefile.src | 2 +- arch/ppc-sam440/exec/mmakefile.src | 2 +- arch/ppc-sam440/processor/mmakefile.src | 4 +- arch/x86_64-all/kernel/mmakefile.src | 5 +- compiler/coolimages/mmakefile.src | 2 +- compiler/stdc/mmakefile.src | 2 +- rom/lddemon/mmakefile.src | 2 +- workbench/c/Shell/mmakefile.src | 6 +- workbench/c/Unpack/mmakefile.src | 2 +- workbench/classes/datatypes/8svx/mmakefile.src | 2 +- .../classes/datatypes/amigaguide/mmakefile.src | 6 +- .../classes/datatypes/animation/mmakefile.src | 2 +- workbench/classes/datatypes/bmp/mmakefile.src | 2 +- workbench/classes/datatypes/gif/mmakefile.src | 2 +- workbench/classes/datatypes/ilbm/mmakefile.src | 2 +- workbench/classes/datatypes/jpeg/mmakefile.src | 5 +- workbench/classes/datatypes/picture/mmakefile.src | 3 +- workbench/classes/datatypes/png/mmakefile.src | 2 +- workbench/classes/datatypes/sound/mmakefile.src | 2 +- workbench/classes/datatypes/text/mmakefile.src | 5 +- workbench/classes/datatypes/wav/mmakefile.src | 7 +- workbench/classes/gadgets/tapedeck/mmakefile.src | 2 +- workbench/classes/zune/aboutwindow/mmakefile.src | 1 + .../classes/zune/betterstring/mcc/mmakefile.src | 4 +- .../classes/zune/betterstring/mcp/mmakefile.src | 2 +- .../classes/zune/nlist/nbalance_mcc/mmakefile.src | 2 +- .../classes/zune/nlist/nbitmap_mcc/mmakefile.src | 2 +- .../zune/nlist/nfloattext_mcc/mmakefile.src | 2 +- .../classes/zune/nlist/nlist_mcc/mmakefile.src | 2 +- .../classes/zune/nlist/nlisttree_mcc/mmakefile.src | 2 +- .../classes/zune/nlist/nlisttree_mcp/mmakefile.src | 2 +- .../classes/zune/nlist/nlistview_mcc/mmakefile.src | 2 +- .../zune/nlist/nlistviews_mcp/mmakefile.src | 2 +- .../classes/zune/texteditor/mcc/mmakefile.src | 2 +- .../classes/zune/texteditor/mcp/mmakefile.src | 2 +- workbench/demos/mmakefile.src | 2 +- workbench/devs/audio/mmakefile.src | 2 +- workbench/libs/freetype/src/mmakefile.src | 21 ++++-- 124 files changed, 277 insertions(+), 220 deletions(-) diff --git a/arch/all-android/kernel/mmakefile.src b/arch/all-android/kernel/mmakefile.src index 43ff948b9f..c67ff86fd7 100644 --- a/arch/all-android/kernel/mmakefile.src +++ b/arch/all-android/kernel/mmakefile.src @@ -5,10 +5,10 @@ include $(SRCDIR)/config/aros.cfg FILES := displayalert _displayalert getpagesize kernel_panic MAINDIR := rom/kernel -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) \ +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) \ $(PRIV_EXEC_INCLUDES) \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) \ - -DHOST_OS_linux -DHOST_OS_android + -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_linux -DHOST_OS_android %build_archspecific \ mainmmake=kernel-kernel modname=kernel maindir=$(MAINDIR) \ diff --git a/arch/all-darwin/hostdisk/mmakefile.src b/arch/all-darwin/hostdisk/mmakefile.src index 4f6803909f..583c1ca791 100644 --- a/arch/all-darwin/hostdisk/mmakefile.src +++ b/arch/all-darwin/hostdisk/mmakefile.src @@ -2,8 +2,8 @@ include $(SRCDIR)/config/aros.cfg #MM- workbench-darwin-$(CPU) : workbench-devs-hostdisk -USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) \ - -I$(SRCDIR)/arch/all-unix/devs/hostdisk \ +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -I$(SRCDIR)/arch/all-unix/devs/hostdisk \ -I$(SRCDIR)/arch/all-hosted/devs/hostdisk \ -isystem $(GENINCDIR) $(KERNEL_INCLUDES) diff --git a/arch/all-hosted/filesys/emul_handler/mmakefile.src b/arch/all-hosted/filesys/emul_handler/mmakefile.src index 3b6ef7f981..65b418c986 100644 --- a/arch/all-hosted/filesys/emul_handler/mmakefile.src +++ b/arch/all-hosted/filesys/emul_handler/mmakefile.src @@ -18,7 +18,7 @@ CONSOLE_FILES := boot ifeq ($(AROS_TARGET_VARIANT),) FILES += $(CONSOLE_FILES) else - USER_CFLAGS += -DNO_EMERGENCY_CONSOLE + USER_CPPFLAGS += -DNO_EMERGENCY_CONSOLE endif %build_module mmake=kernel-fs-emul \ diff --git a/arch/all-hosted/hidd/x11/mmakefile.src b/arch/all-hosted/hidd/x11/mmakefile.src index 983cd33f50..e2dc3f29b0 100644 --- a/arch/all-hosted/hidd/x11/mmakefile.src +++ b/arch/all-hosted/hidd/x11/mmakefile.src @@ -12,7 +12,9 @@ DISK_EXEDIR := $(AROS_DEVS)/Monitors progname=X11 targetdir=$(DISK_EXEDIR) \ files=$(DISK_FILES) -USER_CFLAGS = -DHOST_OS_$(ARCH) -isystem $(GENINCDIR) $(HOST_X11_CFLAGS) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) +USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CFLAGS := $(HOST_X11_CFLAGS) ## The '-Wno-attributes' is here due to a gcc 4.5.x bug ## where its strcmp() builtin generates a number of spurious ## complaints with -O1 or higher optimizations enabled. @@ -22,7 +24,7 @@ USER_LDFLAGS := -static # TODO: What if the system is pure Darwin running a regular PC? ifeq ($(ARCH),darwin) -USER_CFLAGS += -D_FORTIFY_SOURCE=0 +USER_CPPFLAGS += -D_FORTIFY_SOURCE=0 X11KEYMAPTABLE_SRC_FILE := mac-x11-keycode2rawkey.table else X11KEYMAPTABLE_SRC_FILE := def-x11-keycode2rawkey.table diff --git a/arch/all-hosted/hostlib/mmakefile.src b/arch/all-hosted/hostlib/mmakefile.src index dff5267620..d8329345bb 100644 --- a/arch/all-hosted/hostlib/mmakefile.src +++ b/arch/all-hosted/hostlib/mmakefile.src @@ -1,8 +1,9 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DHOST_OS_$(ARCH) -I$(SRCDIR)/arch/all-$(ARCH)/kernel +USER_CPPFLAGS := -DHOST_OS_$(ARCH) +USER_INCLUDES := -I$(SRCDIR)/arch/all-$(ARCH)/kernel ifneq ($(FAMILY),) - USER_CFLAGS += -I$(SRCDIR)/arch/all-$(FAMILY)/kernel + USER_INCLUDES += -I$(SRCDIR)/arch/all-$(FAMILY)/kernel endif FUNCS := open close getpointer freeerrorstr getinterface dropinterface lock unlock diff --git a/arch/all-hosted/libs/hostgl/mmakefile.src b/arch/all-hosted/libs/hostgl/mmakefile.src index 86a0781c87..20fe525cef 100644 --- a/arch/all-hosted/libs/hostgl/mmakefile.src +++ b/arch/all-hosted/libs/hostgl/mmakefile.src @@ -47,7 +47,8 @@ USER_INCLUDES := \ -isystem $(GENINCDIR) \ $(KERNEL_INCLUDES) -USER_CFLAGS := -DHOST_OS_$(ARCH) -DAROSMESA_TYPES='"hostgl_types.h"' $(HOST_X11_CFLAGS) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DAROSMESA_TYPES='"hostgl_types.h"' +USER_CFLAGS := $(HOST_X11_CFLAGS) %build_module_library mmake=workbench-libs-hostgl \ modname=hostgl modtype=library conffile=$(SRCDIR)/workbench/libs/gl/gl.conf \ diff --git a/arch/all-ios/kernel/mmakefile.src b/arch/all-ios/kernel/mmakefile.src index 7b4926af4d..9731ad83ac 100644 --- a/arch/all-ios/kernel/mmakefile.src +++ b/arch/all-ios/kernel/mmakefile.src @@ -5,9 +5,9 @@ include $(SRCDIR)/config/aros.cfg FILES := _displayalert MAINDIR := rom/kernel -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) \ - -DHOST_OS_darwin -DHOST_OS_ios +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ + -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_darwin -DHOST_OS_ios %build_archspecific \ mainmmake=kernel-kernel modname=kernel maindir=$(MAINDIR) \ diff --git a/arch/all-linux/hostdisk/mmakefile.src b/arch/all-linux/hostdisk/mmakefile.src index 353a2536c3..949f451877 100644 --- a/arch/all-linux/hostdisk/mmakefile.src +++ b/arch/all-linux/hostdisk/mmakefile.src @@ -2,8 +2,8 @@ include $(SRCDIR)/config/aros.cfg #MM- workbench-darwin-$(CPU) : workbench-devs-hostdisk -USER_CFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) \ - -I$(SRCDIR)/arch/all-unix/devs/hostdisk \ +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -I$(SRCDIR)/arch/all-unix/devs/hostdisk \ -I$(SRCDIR)/arch/all-hosted/devs/hostdisk \ -isystem $(GENINCDIR) $(KERNEL_INCLUDES) diff --git a/arch/all-mingw32/bootstrap/mmakefile.src b/arch/all-mingw32/bootstrap/mmakefile.src index 19b6dc7e63..24a2eb6811 100644 --- a/arch/all-mingw32/bootstrap/mmakefile.src +++ b/arch/all-mingw32/bootstrap/mmakefile.src @@ -9,7 +9,7 @@ ICON := $(ICONDIR)/icon.o USER_INCLUDES := -I$(SRCDIR)/arch/all-hosted/bootstrap \ -I$(SRCDIR)/arch/all-mingw32/kernel \ -I$(GENINCDIR) -USER_CFLAGS := -DARCH=\"$(AROS_DIR_ARCH)\" +USER_CPPFLAGS := -DARCH=\"$(AROS_DIR_ARCH)\" #MM kernel-bootstrap-hosted-mingw32: kernel-bootstrap-icon-mingw32 diff --git a/arch/all-mingw32/filesys/emul_handler/emul_host.c b/arch/all-mingw32/filesys/emul_handler/emul_host.c index 944ce8261c..c7106a5e51 100644 --- a/arch/all-mingw32/filesys/emul_handler/emul_host.c +++ b/arch/all-mingw32/filesys/emul_handler/emul_host.c @@ -641,43 +641,44 @@ static ULONG ReadDir(struct emulbase *emulbase, struct filehandle *fh, LPWIN32_F do { - /* - * 3. Now we will scan the next directory entry until its index is greater than original index - * in dirpos. This means that we've repositioned and scanned the next entry. After this we - * update dirpos. - */ - do - { - ULONG err; - - if (fh->fd == INVALID_HANDLE_VALUE) - { - DEXAM(bug("[emul] Finding first file\n")); - Forbid(); - fh->fd = emulbase->pdata.KernelIFace->FindFirstFile(fh->ph.pathname, FindData); - err = emulbase->pdata.KernelIFace->GetLastError(); - Permit(); - res = (fh->fd != INVALID_HANDLE_VALUE); - } - else - { - Forbid(); - res = emulbase->pdata.KernelIFace->FindNextFile(fh->fd, FindData); - err = emulbase->pdata.KernelIFace->GetLastError(); - Permit(); - } - if (!res) - return Errno_w2a(err, MODE_OLDFILE); - - fh->ph.dirpos++; - DEXAM(bug("[emul] Found %s, position %lu\n", FindData->cFileName, fh->ph.dirpos)); - } while (fh->ph.dirpos <= *dirpos); - (*dirpos)++; - DEXAM(bug("[emul] New dirpos: %lu\n", *dirpos)); - /* - * We also skip "." and ".." entries (however we count their indexes - just in case), because - * AmigaOS donesn't have them. - */ + /* + * 3. Now we will scan the next directory entry until its index is greater than original index + * in dirpos. This means that we've repositioned and scanned the next entry. After this we + * update dirpos. + */ + do + { + ULONG err; + + if (fh->fd == INVALID_HANDLE_VALUE) + { + DEXAM(bug("[emul] Finding first file\n")); + Forbid(); + fh->fd = emulbase->pdata.KernelIFace->FindFirstFile(fh->ph.pathname, FindData); + err = emulbase->pdata.KernelIFace->GetLastError(); + Permit(); + res = (fh->fd != INVALID_HANDLE_VALUE); + } + else + { + Forbid(); + res = emulbase->pdata.KernelIFace->FindNextFile(fh->fd, FindData); + err = emulbase->pdata.KernelIFace->GetLastError(); + Permit(); + } + + if (!res) + return Errno_w2a(err, MODE_OLDFILE); + + fh->ph.dirpos++; + DEXAM(bug("[emul] Found %s, position %lu\n", FindData->cFileName, fh->ph.dirpos)); + } while (fh->ph.dirpos <= *dirpos); + (*dirpos)++; + DEXAM(bug("[emul] New dirpos: %lu\n", *dirpos)); + /* + * We also skip "." and ".." entries (however we count their indexes - just in case), because + * AmigaOS donesn't have them. + */ } while (is_special_dir(FindData->cFileName)); return 0; diff --git a/arch/all-native/econsole/mmakefile.src b/arch/all-native/econsole/mmakefile.src index 3f9adc731e..a317f925fc 100644 --- a/arch/all-native/econsole/mmakefile.src +++ b/arch/all-native/econsole/mmakefile.src @@ -11,7 +11,7 @@ FILES := econsole # # Also supplies a minimal boot disk at priority -127. -USER_CFLAGS += -DAROS_CPU="\"$(AROS_TARGET_CPU)\"" +USER_CPPFLAGS += -DAROS_CPU="\"$(AROS_TARGET_CPU)\"" %build_module mmake=kernel-econsole \ modname=econsole modtype=handler \ diff --git a/arch/all-pc/acpitool/mmakefile.src b/arch/all-pc/acpitool/mmakefile.src index 211535bb69..9b4d3d707e 100644 --- a/arch/all-pc/acpitool/mmakefile.src +++ b/arch/all-pc/acpitool/mmakefile.src @@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg FILES := main locale parsers -USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" EXEDIR := $(AROS_DEBUG)/Hardware # Build ACPITool only for PC diff --git a/arch/all-pc/boot/grub2-tools/mmakefile.src b/arch/all-pc/boot/grub2-tools/mmakefile.src index 820a5fa75d..94d3e611e1 100644 --- a/arch/all-pc/boot/grub2-tools/mmakefile.src +++ b/arch/all-pc/boot/grub2-tools/mmakefile.src @@ -5,7 +5,8 @@ include $(SRCDIR)/config/aros.cfg FILES := Install-grub2 -USER_CFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" -isystem $(SRCDIR)/arch/all-pc/boot/grub2-aros/include +USER_CPPFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" +USER_INCLUDES := -isystem $(SRCDIR)/arch/all-pc/boot/grub2-aros/include %build_progs mmake=workbench-c-install-grub2 \ files=$(FILES) targetdir=$(AROS_C) \ diff --git a/arch/all-pc/bootstrap/mmakefile.src b/arch/all-pc/bootstrap/mmakefile.src index 6f5fbbdf34..b27b6cf49f 100644 --- a/arch/all-pc/bootstrap/mmakefile.src +++ b/arch/all-pc/bootstrap/mmakefile.src @@ -15,8 +15,9 @@ else ARCH_LIBS := -L$(AROS_DEVELOPER)/lib -L$(GENDIR)/lib endif -USER_CFLAGS := -Wl,--oformat,elf_i386 -m32 -isystem $(SRCDIR)/arch/all-native/bootconsole/include -isystem $(SRCDIR)/bootstrap/include \ - $(ARCH_DEFS) -DBOOTLOADER_$(AROS_TARGET_BOOTLOADER) +USER_CFLAGS := -Wl,--oformat,elf_i386 -m32 +USER_INCLUDES := -isystem $(SRCDIR)/arch/all-native/bootconsole/include -isystem $(SRCDIR)/bootstrap/include +USER_CPPFLAGS := $(ARCH_DEFS) -DBOOTLOADER_$(AROS_TARGET_BOOTLOADER) USER_LDFLAGS := -m32 -Wl,-N,-e,kernel_bootstrap -Wl,-Map,$(GENDIR)/boot/bootstrap-pc.map \ -Wl,-T,$(SRCDIR)/$(CURDIR)/ldscript.lds -static-libgcc $(ARCH_LIBS) USER_OBJS := $(OBJDIR)/vesa.bin.o diff --git a/arch/all-pc/hpet/mmakefile.src b/arch/all-pc/hpet/mmakefile.src index 895bcdb4f8..d5949c80de 100644 --- a/arch/all-pc/hpet/mmakefile.src +++ b/arch/all-pc/hpet/mmakefile.src @@ -7,7 +7,7 @@ FUNCS := gethpetcount allochpetunit freehpetunit getunitattrsa #MM- includes-generate : kernel-pc-hpet-includes -USER_CFLAGS += -DDEBUG=1 +USER_CPPFLAGS += -DDEBUG=1 %build_module mmake=kernel-pc-hpet \ modname=hpet modtype=resource \ diff --git a/arch/all-pc/processor/mmakefile.src b/arch/all-pc/processor/mmakefile.src index f4c1246da4..3a9f818271 100644 --- a/arch/all-pc/processor/mmakefile.src +++ b/arch/all-pc/processor/mmakefile.src @@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/processor +USER_INCLUDES := -I$(SRCDIR)/rom/processor FILES := \ getcpuinfo \ diff --git a/arch/all-unix/battclock/mmakefile.src b/arch/all-unix/battclock/mmakefile.src index 5d8a4497a6..6f9a2e5607 100644 --- a/arch/all-unix/battclock/mmakefile.src +++ b/arch/all-unix/battclock/mmakefile.src @@ -2,8 +2,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) \ - -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) %build_archspecific \ mainmmake=kernel-battclock modname=battclock maindir=rom/battclock \ diff --git a/arch/all-unix/bootstrap/mmakefile.src b/arch/all-unix/bootstrap/mmakefile.src index 1169525448..f738c3e0ed 100644 --- a/arch/all-unix/bootstrap/mmakefile.src +++ b/arch/all-unix/bootstrap/mmakefile.src @@ -5,12 +5,14 @@ include $(SRCDIR)/config/aros.cfg EXEDIR := $(AROSDIR)/boot FILES := hostinterface hostlib kickstart kputc memory preboot shutdown support -USER_INCLUDES := -I$(SRCDIR)/arch/all-hosted/bootstrap \ +USER_INCLUDES := \ + -I$(SRCDIR)/arch/all-hosted/bootstrap \ -I$(SRCDIR)/arch/all-unix/kernel \ -I$(GENINCDIR) \ - -isystem $(SRCDIR)/bootstrap/include \ - -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" -USER_CFLAGS := -DARCH=\"$(AROS_DIR_ARCH)\" + -isystem $(SRCDIR)/bootstrap/include +USER_CPPFLAGS := \ + -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ + -DARCH=\"$(AROS_DIR_ARCH)\" %build_archspecific \ mainmmake=kernel-bootstrap-hosted maindir=arch/all-hosted/bootstrap arch=unix \ diff --git a/arch/all-unix/devs/hostdisk/mmakefile.src b/arch/all-unix/devs/hostdisk/mmakefile.src index df484fcf83..e57e16b688 100644 --- a/arch/all-unix/devs/hostdisk/mmakefile.src +++ b/arch/all-unix/devs/hostdisk/mmakefile.src @@ -2,9 +2,9 @@ include $(SRCDIR)/config/aros.cfg #MM- workbench-unix : workbench-devs-hostdisk -USER_CFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ - -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) \ - -I$(SRCDIR)/arch/all-hosted/devs/hostdisk -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ + -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -I$(SRCDIR)/arch/all-hosted/devs/hostdisk -isystem $(GENINCDIR) $(KERNEL_INCLUDES) ## The '-Wno-attributes' is here due to a gcc 4.5.x bug ## where its strcmp() builtin generates a number of spurious diff --git a/arch/all-unix/devs/networks/eth/mmakefile.src b/arch/all-unix/devs/networks/eth/mmakefile.src index 82bce66eec..ffb9173fdf 100644 --- a/arch/all-unix/devs/networks/eth/mmakefile.src +++ b/arch/all-unix/devs/networks/eth/mmakefile.src @@ -1,7 +1,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DHOST_OS_$(ARCH) -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" +USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) %build_module mmake=workbench-devs-eth-unix \ modname=eth modtype=device version=$(AROS_TARGET_PLATFORM) \ diff --git a/arch/all-unix/devs/networks/tap/mmakefile.src b/arch/all-unix/devs/networks/tap/mmakefile.src index 7d966b9479..32cd2f9262 100644 --- a/arch/all-unix/devs/networks/tap/mmakefile.src +++ b/arch/all-unix/devs/networks/tap/mmakefile.src @@ -1,7 +1,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DHOST_OS_$(ARCH) -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" +USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) %build_module mmake=workbench-devs-tap-unix \ modname=tap modtype=device version=$(AROS_TARGET_PLATFORM) \ diff --git a/arch/all-unix/exec/mmakefile.src b/arch/all-unix/exec/mmakefile.src index c88e7f5fa8..eb23d1c8f6 100644 --- a/arch/all-unix/exec/mmakefile.src +++ b/arch/all-unix/exec/mmakefile.src @@ -7,21 +7,21 @@ FILES := platform_init coldreboot shutdowna # swapcontext() and friends are not implemented on ARM Linux and are totally missing on Android ifneq ($(AROS_TARGET_CPU), arm) ifneq ($(AROS_TARGET_VARIANT), android) -USER_CFLAGS := -DHAVE_SWAPCONTEXT +USER_CPPFLAGS := -DHAVE_SWAPCONTEXT FILES += newstackswap endif endif ifeq ($(ARCH),darwin) -USER_CFLAGS += -D_FORTIFY_SOURCE=0 +USER_CPPFLAGS += -D_FORTIFY_SOURCE=0 endif USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) \ - -DHOST_OS_$(ARCH) + -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS += -DHOST_OS_$(ARCH) ifneq ($(AROS_TARGET_VARIANT),) -USER_INCLUDES := -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_CPPFLAGS += -DHOST_OS_$(AROS_TARGET_VARIANT) endif %build_archspecific \ diff --git a/arch/all-unix/filesys/emul_handler/mmakefile.src b/arch/all-unix/filesys/emul_handler/mmakefile.src index bc8498e159..3a5f51a791 100644 --- a/arch/all-unix/filesys/emul_handler/mmakefile.src +++ b/arch/all-unix/filesys/emul_handler/mmakefile.src @@ -4,13 +4,13 @@ include $(SRCDIR)/config/aros.cfg MAINDIR := arch/all-hosted/filesys/emul_handler -USER_CFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) \ - -I$(SRCDIR)/$(CURDIR) \ +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -I$(SRCDIR)/$(CURDIR) \ -I$(SRCDIR)/$(MAINDIR) \ -isystem $(GENINCDIR) $(KERNEL_INCLUDES) ifeq ($(ARCH),darwin) -USER_CFLAGS += -D_FORTIFY_SOURCE=0 +USER_CPPFLAGS += -D_FORTIFY_SOURCE=0 endif FILES := emul_host_unix emul_host emul_dir diff --git a/arch/all-unix/hidd/parallel/mmakefile.src b/arch/all-unix/hidd/parallel/mmakefile.src index 0b5fa8b2a2..cb6672e9f6 100644 --- a/arch/all-unix/hidd/parallel/mmakefile.src +++ b/arch/all-unix/hidd/parallel/mmakefile.src @@ -4,8 +4,8 @@ include $(SRCDIR)/config/aros.cfg FILES := ParallelClass ParallelUnitClass -USER_CFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" +USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) %build_module mmake=workbench-hidd-unix-parallel \ modname=parallel modtype=hidd \ diff --git a/arch/all-unix/hidd/serial/mmakefile.src b/arch/all-unix/hidd/serial/mmakefile.src index 0044c16baa..beceec02fa 100644 --- a/arch/all-unix/hidd/serial/mmakefile.src +++ b/arch/all-unix/hidd/serial/mmakefile.src @@ -4,8 +4,8 @@ include $(SRCDIR)/config/aros.cfg FILES := SerialClass SerialUnitClass #unix_funcs -USER_CFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" +USER_INCLUDES := -isystem $(GENINCDIR) $(KERNEL_INCLUDES) %build_module mmake=workbench-hidd-unix-serial \ modname=serial modtype=hidd \ diff --git a/arch/all-unix/hidd/unixio/mmakefile.src b/arch/all-unix/hidd/unixio/mmakefile.src index 0485c1e180..874ea3824f 100644 --- a/arch/all-unix/hidd/unixio/mmakefile.src +++ b/arch/all-unix/hidd/unixio/mmakefile.src @@ -5,12 +5,12 @@ include $(SRCDIR)/config/aros.cfg #MM kernel-unixio : kernel-kernel-includes hidd-unixio-stubs #MM kernel-unixio-kobj : kernel-kernel-includes hidd-unixio-stubs -USER_CFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) \ - -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ -isystem $(GENINCDIR) $(KERNEL_INCLUDES) ifeq ($(ARCH),darwin) -USER_CFLAGS += -D_FORTIFY_SOURCE=0 +USER_CPPFLAGS += -D_FORTIFY_SOURCE=0 endif ## The '-Wno-attributes' is here due to a gcc 4.5.x bug diff --git a/arch/all-unix/kernel/mmakefile.src b/arch/all-unix/kernel/mmakefile.src index 97771bcb42..4724279ae3 100644 --- a/arch/all-unix/kernel/mmakefile.src +++ b/arch/all-unix/kernel/mmakefile.src @@ -3,9 +3,9 @@ include $(SRCDIR)/config/aros.cfg MAINDIR := rom/kernel -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) -I$(GENDIR)/$(MAINDIR)/include \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) \ - -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) -I$(GENDIR)/$(MAINDIR)/include \ + -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" \ -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) ifneq ("","$(strip $(WARN_ERROR))") diff --git a/arch/all-unix/libs/oss/mmakefile.src b/arch/all-unix/libs/oss/mmakefile.src index fdd6f9c1f0..4c5863400a 100644 --- a/arch/all-unix/libs/oss/mmakefile.src +++ b/arch/all-unix/libs/oss/mmakefile.src @@ -26,7 +26,7 @@ FILES := funcs %build_prog mmake=test-playoss \ progname=playossunix targetdir=$(AROS_TESTS) uselibs="ossshared" -USER_CFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" +USER_CPPFLAGS := -DAROS_ARCHITECTURE="\"$(AROS_TARGET_PLATFORM)\"" # If we are not on UNIX, we're just building the linklib for the SDK. We don't need # $(KERNEL_INCLUDES) in such a case. This fixes build under 64-bit Windows. diff --git a/arch/all-unix/timer/mmakefile.src b/arch/all-unix/timer/mmakefile.src index b6b1508c6e..cc8baaf1d4 100644 --- a/arch/all-unix/timer/mmakefile.src +++ b/arch/all-unix/timer/mmakefile.src @@ -3,8 +3,8 @@ include $(SRCDIR)/config/aros.cfg USER_INCLUDES := -I$(SRCDIR)/$(CURDIR) -I$(SRCDIR)/rom/timer \ - -isystem $(GENINCDIR) $(KERNEL_INCLUDES) \ - -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) + -isystem $(GENINCDIR) $(KERNEL_INCLUDES) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) -DHOST_OS_$(AROS_TARGET_VARIANT) ifneq ("","$(strip $(WARN_ERROR))") CONFIG_CFLAGS := $(subst $(WARN_ERROR),,$(CONFIG_CFLAGS)) diff --git a/arch/arm-all/dos/mmakefile.src b/arch/arm-all/dos/mmakefile.src index c073d064b6..681689404d 100644 --- a/arch/arm-all/dos/mmakefile.src +++ b/arch/arm-all/dos/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/dos +USER_INCLUDES := -I$(SRCDIR)/rom/dos #MM- kernel-dos-arm: includes #MM- kernel-dos-armeb: includes diff --git a/arch/arm-all/exec/mmakefile.src b/arch/arm-all/exec/mmakefile.src index 755a6c88c2..37626a5159 100644 --- a/arch/arm-all/exec/mmakefile.src +++ b/arch/arm-all/exec/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) #MM- kernel-exec-arm: includes-asm_h-arm kernel-kernel-includes diff --git a/arch/arm-all/kernel/mmakefile.src b/arch/arm-all/kernel/mmakefile.src index 9b73daa76e..453d5e46f7 100644 --- a/arch/arm-all/kernel/mmakefile.src +++ b/arch/arm-all/kernel/mmakefile.src @@ -2,7 +2,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) -I$(GENINCDIR) -D__AROS_EXEC_LIBRARY__ +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) -I$(GENINCDIR) +USER_CPPFLAGS := -D__AROS_EXEC_LIBRARY__ %build_archspecific \ mainmmake=kernel-kernel modname=kernel maindir=rom/kernel \ diff --git a/arch/arm-efika/boot/mmakefile.src b/arch/arm-efika/boot/mmakefile.src index 5445e7cef9..e3612892e3 100644 --- a/arch/arm-efika/boot/mmakefile.src +++ b/arch/arm-efika/boot/mmakefile.src @@ -4,7 +4,9 @@ include $(SRCDIR)/config/aros.cfg TARGETDIR := $(GENDIR)/$(CURDIR) FILES := boot serialdebug elf support -USER_CFLAGS := -DUSE_UBOOT -ffixed-r8 -Wall -fno-builtin -O2 +USER_CFLAGS := -ffixed-r8 -Wall $(CFLAGS_NO_BUILTIN) +USER_CPPFLAGS := -DUSE_UBOOT +OPTIMIZATION_CFLAGS := -O2 #MM arosboot-efika: \ #MM kernel-efika-arm \ diff --git a/arch/arm-linux/processor/mmakefile.src b/arch/arm-linux/processor/mmakefile.src index 85d8a9ca81..35f9b38dd0 100644 --- a/arch/arm-linux/processor/mmakefile.src +++ b/arch/arm-linux/processor/mmakefile.src @@ -3,7 +3,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DHOST_OS_$(AROS_TARGET_VARIANT) -I$(SRCDIR)/rom/processor +USER_CPPFLAGS := -DHOST_OS_$(AROS_TARGET_VARIANT) +USER_INCLUDES := -I$(SRCDIR)/rom/processor FILES := arch_init getcpuinfo diff --git a/arch/arm-native/ceboot/mmakefile.src b/arch/arm-native/ceboot/mmakefile.src index 3923f24c36..4b29893c38 100644 --- a/arch/arm-native/ceboot/mmakefile.src +++ b/arch/arm-native/ceboot/mmakefile.src @@ -10,7 +10,8 @@ PROG := CEBoot.exe ## The '-Wno-attributes' is here due to a gcc 4.5.x bug ## where its strcmp() builtin generates a number of spurious ## complaints with -O1 or higher optimizations enabled. -USER_CFLAGS := -Wno-attributes -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_CFLAGS := -Wno-attributes +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" USER_LDFLAGS := -L$(GENDIR)/lib USER_INCLUDES := -I$(GENINCDIR) -isystem $(SRCDIR)/bootstrap/include diff --git a/arch/arm-native/exec/mmakefile.src b/arch/arm-native/exec/mmakefile.src index 35931c6032..f4e969026b 100644 --- a/arch/arm-native/exec/mmakefile.src +++ b/arch/arm-native/exec/mmakefile.src @@ -18,8 +18,10 @@ CFILES := \ #MM kernel-exec-raspi-arm : kernel-kernel-arm-includes kernel-exec-includes #MM kernel-exec-raspi-armeb : kernel-kernel-armeb-includes kernel-exec-includes -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) -Os -USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) -Os +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) +USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) + +OPTIMIZATION_CFLAGS := -Os %build_archspecific \ mainmmake=kernel-exec maindir=rom/exec arch=raspi-arm \ diff --git a/arch/arm-native/processor/mmakefile.src b/arch/arm-native/processor/mmakefile.src index 445ba27738..3893e8b435 100644 --- a/arch/arm-native/processor/mmakefile.src +++ b/arch/arm-native/processor/mmakefile.src @@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/processor +USER_INCLUDES := -I$(SRCDIR)/rom/processor FILES := \ getcpuinfo \ diff --git a/arch/arm-native/soc/broadcom/2708/usb/poseidon/mmakefile.src b/arch/arm-native/soc/broadcom/2708/usb/poseidon/mmakefile.src index a2819dd598..519da50bd6 100644 --- a/arch/arm-native/soc/broadcom/2708/usb/poseidon/mmakefile.src +++ b/arch/arm-native/soc/broadcom/2708/usb/poseidon/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DMUIMASTER_YES_INLINE_STDARG +USER_CPPFLAGS := -DMUIMASTER_YES_INLINE_STDARG #MM- kernel-usb-romstrap-raspi : kernel-usb-poseidon diff --git a/arch/arm-raspi/boot/mmakefile.src b/arch/arm-raspi/boot/mmakefile.src index b13be06275..26e0f757d0 100644 --- a/arch/arm-raspi/boot/mmakefile.src +++ b/arch/arm-raspi/boot/mmakefile.src @@ -4,9 +4,11 @@ include $(SRCDIR)/config/aros.cfg TARGETDIR := $(GENDIR)/$(CURDIR) FILES := boot serialdebug mmu kprintf elf support bc/font8x14 bc/vars vc_mb vc_fb bc/screen_fb -USER_CFLAGS := -DUSE_UBOOT -ffixed-r8 -Wall -fno-builtin -O2 +USER_CPPFLAGS := -DUSE_UBOOT +USER_CFLAGS := -ffixed-r8 -Wall $(CFLAGS_NO_BUILTIN) KERNEL_LDFLAGS = USER_INCLUDES := -isystem $(SRCDIR)/$(CURDIR)/include +OPTIMIZATION_CFLAGS := -O2 ARM_BSP := aros-$(AROS_TARGET_CPU)-bsp.rom diff --git a/arch/armeb-all/exec/mmakefile.src b/arch/armeb-all/exec/mmakefile.src index f87b841f31..a658b97619 100644 --- a/arch/armeb-all/exec/mmakefile.src +++ b/arch/armeb-all/exec/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) #MM- kernel-exec-armeb: includes-asm_h-armeb kernel-kernel-includes diff --git a/arch/armeb-raspi/boot/mmakefile.src b/arch/armeb-raspi/boot/mmakefile.src index ac43ff12a9..df2d4c8ff0 100644 --- a/arch/armeb-raspi/boot/mmakefile.src +++ b/arch/armeb-raspi/boot/mmakefile.src @@ -5,9 +5,11 @@ include $(SRCDIR)/config/aros.cfg TARGETDIR := $(GENDIR)/$(CURDIR) FILES := boot mmu kprintf support vc_mb serialdebug elf devicetree \ bc/vars bc/font8x14 bc/screen_fb vc_fb -USER_CFLAGS := -DUSE_UBOOT -ffixed-r8 -Wall -fno-builtin -O2 -mcpu=cortex-a7 +USER_CFLAGS :=-ffixed-r8 -Wall $(CFLAGS_NO_BUILTIN) -mcpu=cortex-a7 KERNEL_LDFLAGS = USER_INCLUDES := -isystem $(SRCDIR)/$(CURDIR)/include -I$(SRCDIR)/rom/openfirmware +USER_CPPFLAGS := -DUSE_UBOOT +OPTIMIZATION_CFLAGS := -O2 ARM_BSP := aros-$(AROS_TARGET_CPU)-bsp.rom diff --git a/arch/i386-all/exec/mmakefile.src b/arch/i386-all/exec/mmakefile.src index edca74658f..89b2a08628 100644 --- a/arch/i386-all/exec/mmakefile.src +++ b/arch/i386-all/exec/mmakefile.src @@ -5,9 +5,9 @@ include $(SRCDIR)/config/aros.cfg FILES := alert_cpu cpu_init newstackswap preparecontext AFILES := execstubs stackswap copymem_SSE -USER_CFLAGS := -O0 USER_AFLAGS := -I$(GENINCDIR) USER_INCLUDES := $(PRIV_EXEC_INCLUDES) +OPTIMIZATION_CFLAGS := -O0 %build_archspecific \ mainmmake=kernel-exec modname=exec maindir=rom/exec \ diff --git a/arch/i386-all/hidd/gfx/mmakefile.src b/arch/i386-all/hidd/gfx/mmakefile.src index e0c9e2f21d..04c6c30a22 100644 --- a/arch/i386-all/hidd/gfx/mmakefile.src +++ b/arch/i386-all/hidd/gfx/mmakefile.src @@ -7,7 +7,7 @@ include $(SRCDIR)/config/aros.cfg FILES := rgbconv_arch AFILES := -USER_CFLAGS := -I$(SRCDIR)/rom/hidds/gfx +USER_INCLUDES := -I$(SRCDIR)/rom/hidds/gfx %build_archspecific \ mainmmake=kernel-hidd-gfx modname=gfx maindir=rom/hidds/gfx \ diff --git a/arch/i386-all/kernel/mmakefile.src b/arch/i386-all/kernel/mmakefile.src index 2b9005a2ef..f72dd83f8c 100644 --- a/arch/i386-all/kernel/mmakefile.src +++ b/arch/i386-all/kernel/mmakefile.src @@ -5,7 +5,8 @@ include $(SRCDIR)/config/aros.cfg FILES := cpu_init createcontext USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -I$(GENINCDIR) -D__AROS_EXEC_LIBRARY__ + -I$(GENINCDIR) +USER_CPPFLAGS := -D__AROS_EXEC_LIBRARY__ %build_archspecific \ mainmmake=kernel-kernel modname=kernel maindir=rom/kernel \ diff --git a/arch/i386-all/stdc/mmakefile.src b/arch/i386-all/stdc/mmakefile.src index 3737cebabe..539763a77f 100644 --- a/arch/i386-all/stdc/mmakefile.src +++ b/arch/i386-all/stdc/mmakefile.src @@ -3,7 +3,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/compiler/stdc/math/ld80 +USER_INCLUDES := -I$(SRCDIR)/compiler/stdc/math/ld80 USER_AFLAGS := -I$(GENINCDIR) STDC_I386_SSE_FILES := \ diff --git a/arch/i386-pc/exec/mmakefile.src b/arch/i386-pc/exec/mmakefile.src index 0d20dc9d5a..6486641def 100644 --- a/arch/i386-pc/exec/mmakefile.src +++ b/arch/i386-pc/exec/mmakefile.src @@ -7,7 +7,7 @@ AFILES := cache userstate #MM kernel-exec-pc-i386 : kernel-kernel-includes kernel-exec-includes includes-asm_h-i386 -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) %build_archspecific \ diff --git a/arch/m68k-all/debug/mmakefile.src b/arch/m68k-all/debug/mmakefile.src index 3b4de6f704..4dc9804402 100644 --- a/arch/m68k-all/debug/mmakefile.src +++ b/arch/m68k-all/debug/mmakefile.src @@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg FILES=debug_gdb segtracker -USER_CFLAGS += -I$(SRCDIR)/rom/debug +USER_INCLUDES += -I$(SRCDIR)/rom/debug %build_archspecific \ mainmmake=kernel-debug modname=debug maindir=rom/debug arch=m68k \ diff --git a/arch/m68k-all/dos/mmakefile.src b/arch/m68k-all/dos/mmakefile.src index 0ff4eca152..8641260155 100644 --- a/arch/m68k-all/dos/mmakefile.src +++ b/arch/m68k-all/dos/mmakefile.src @@ -13,9 +13,9 @@ AFILES := callentry \ #MM kernel-dos-m68k : kernel-dos-includes includes-asm_h-m68k -USER_CFLAGS := -I$(SRCDIR)/arch/$(CPU)-$(ARCH)/dos \ - -I$(SRCDIR)/rom/dos \ - -D__DOS_NOLIBBASE__ +USER_INCLUDES := -I$(SRCDIR)/arch/$(CPU)-$(ARCH)/dos \ + -I$(SRCDIR)/rom/dos +USER_CFLAGS := -D__DOS_NOLIBBASE__ USER_AFLAGS := -I$(GENINCDIR) diff --git a/arch/m68k-all/exec/mmakefile.src b/arch/m68k-all/exec/mmakefile.src index 54ab82df95..9b1c1fe514 100644 --- a/arch/m68k-all/exec/mmakefile.src +++ b/arch/m68k-all/exec/mmakefile.src @@ -16,7 +16,7 @@ AFILES=newstackswap stackswap \ copymem_ copymem_020 copymem_040 copymem_060 \ copymemquick copymemquick_040 copymemquick_060 -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) USER_AFLAGS := -I$(GENINCDIR) ISA_FLAGS:=$(ISA_MC68060_FLAGS) diff --git a/arch/m68k-all/m680x0/mmakefile.src b/arch/m68k-all/m680x0/mmakefile.src index a09dded82f..6d899915c4 100644 --- a/arch/m68k-all/m680x0/mmakefile.src +++ b/arch/m68k-all/m680x0/mmakefile.src @@ -7,7 +7,8 @@ include $(SRCDIR)/config/aros.cfg FILES := init AFILES := m68k_060sp -USER_AFLAGS := -I$(GENINCDIR) -DDoRegisterCalls +USER_AFLAGS := -I$(GENINCDIR) +USER_CPPFLAGS := -DDoRegisterCalls USER_INCLUDES := -I$(SRCDIR)/arch/$(CPU)-all/m680x0 ISA_FLAGS:=$(ISA_MC68020_FLAGS) diff --git a/arch/m68k-all/mathffp/mmakefile.src b/arch/m68k-all/mathffp/mmakefile.src index 18de781ade..d9061e8f5a 100644 --- a/arch/m68k-all/mathffp/mmakefile.src +++ b/arch/m68k-all/mathffp/mmakefile.src @@ -5,7 +5,8 @@ include $(SRCDIR)/config/aros.cfg FILES := AFILES := spcmp sptst -USER_AFLAGS := -I$(GENINCDIR) -DDoRegisterCalls +USER_AFLAGS := -I$(GENINCDIR) +USER_CPPFLAGS := -DDoRegisterCalls ISA_FLAGS:=$(ISA_MC68020_FLAGS) %build_archspecific \ diff --git a/arch/m68k-all/mathieeedoubbas/mmakefile.src b/arch/m68k-all/mathieeedoubbas/mmakefile.src index 7e6cd3073f..3ddf094844 100644 --- a/arch/m68k-all/mathieeedoubbas/mmakefile.src +++ b/arch/m68k-all/mathieeedoubbas/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg FILES := ieeedpbas_fpu mathieeedoubbas_init AFILES := fpu -USER_CFLAGS := -I$(SRCDIR)/workbench/libs/mathieeedoubbas +USER_INCLUDES := -I$(SRCDIR)/workbench/libs/mathieeedoubbas USER_AFLAGS := -I$(GENINCDIR) -march=68040 %build_archspecific \ diff --git a/arch/m68k-all/mathieeedoubtrans/mmakefile.src b/arch/m68k-all/mathieeedoubtrans/mmakefile.src index b76abe46ad..09683333e5 100644 --- a/arch/m68k-all/mathieeedoubtrans/mmakefile.src +++ b/arch/m68k-all/mathieeedoubtrans/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg FILES := ieeedptrans_fpu mathieeedoubtrans_init AFILES := fpu -USER_CFLAGS := -I$(SRCDIR)/workbench/libs/mathieeedoubtrans +USER_INCLUDES := -I$(SRCDIR)/workbench/libs/mathieeedoubtrans USER_AFLAGS := -I$(GENINCDIR) -march=68040 %build_archspecific \ diff --git a/arch/m68k-all/mathieeesingbas/mmakefile.src b/arch/m68k-all/mathieeesingbas/mmakefile.src index 87a6d77143..f01fdb3345 100644 --- a/arch/m68k-all/mathieeesingbas/mmakefile.src +++ b/arch/m68k-all/mathieeesingbas/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg FILES := mathieeesingbas_init AFILES := fpu -USER_CFLAGS := -I$(SRCDIR)/workbench/libs/mathieeesingbas +USER_INCLUDES := -I$(SRCDIR)/workbench/libs/mathieeesingbas USER_AFLAGS := -I$(GENINCDIR) -march=68040 %build_archspecific \ diff --git a/arch/m68k-all/mathieeesingtrans/mmakefile.src b/arch/m68k-all/mathieeesingtrans/mmakefile.src index 9c56a44181..5f4696cda9 100644 --- a/arch/m68k-all/mathieeesingtrans/mmakefile.src +++ b/arch/m68k-all/mathieeesingtrans/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg FILES := mathieeesingtrans_init AFILES := fpu -USER_CFLAGS := -I$(SRCDIR)/workbench/libs/mathieeesingtrans +USER_INCLUDES := -I$(SRCDIR)/workbench/libs/mathieeesingtrans USER_AFLAGS := -I$(GENINCDIR) -march=68040 %build_archspecific \ diff --git a/arch/m68k-all/posixc/mmakefile.src b/arch/m68k-all/posixc/mmakefile.src index 8ee2e6cd5b..04f2fdc9da 100644 --- a/arch/m68k-all/posixc/mmakefile.src +++ b/arch/m68k-all/posixc/mmakefile.src @@ -2,7 +2,8 @@ include $(SRCDIR)/config/aros.cfg -USER_AFLAGS := -I$(GENINCDIR) -DDEBUG=0 +USER_AFLAGS := -I$(GENINCDIR) +USER_CPPFLAGS := -DDEBUG=0 #MM- compiler-posixc-m68k : includes-asm_h-m68k diff --git a/arch/m68k-all/processor/mmakefile.src b/arch/m68k-all/processor/mmakefile.src index 950539e6b7..031daf0461 100644 --- a/arch/m68k-all/processor/mmakefile.src +++ b/arch/m68k-all/processor/mmakefile.src @@ -10,7 +10,7 @@ FILES := \ #MM- kernel-processor-m68k : includes -USER_CFLAGS := -D__UTILITY_NOLIBBASE__ +USER_CPPFLAGS := -D__UTILITY_NOLIBBASE__ USER_INCLUDES := -I$(SRCDIR)/rom/processor %build_archspecific mainmmake=kernel-processor modname=processor maindir=rom/processor \ diff --git a/arch/m68k-all/test/mmakefile.src b/arch/m68k-all/test/mmakefile.src index 8911f5d9d4..ea113245a5 100644 --- a/arch/m68k-all/test/mmakefile.src +++ b/arch/m68k-all/test/mmakefile.src @@ -8,7 +8,7 @@ EXEDIR := $(AROS_TESTS) FILES=bcpl_strings -USER_CFLAGS = -I$(SRCDIR)/arch/m68k-all/dos +USER_INCLUDES = -I$(SRCDIR)/arch/m68k-all/dos %build_progs mmake=test-m68k \ files=$(FILES) targetdir=$(EXEDIR) \ diff --git a/arch/m68k-all/utility/mmakefile.src b/arch/m68k-all/utility/mmakefile.src index 226e0af501..d3fb76b3fc 100644 --- a/arch/m68k-all/utility/mmakefile.src +++ b/arch/m68k-all/utility/mmakefile.src @@ -5,7 +5,8 @@ include $(SRCDIR)/config/aros.cfg FILES := AFILES := sdivmod32 smult32 smult64 udivmod32 umult32 umult64 -USER_AFLAGS := -I$(GENINCDIR) -DDoRegisterCalls +USER_AFLAGS := -I$(GENINCDIR) +USER_CPPFLAGS := -DDoRegisterCalls ISA_FLAGS:=$(ISA_MC68020_FLAGS) %build_archspecific \ diff --git a/arch/m68k-amiga/boot/mmakefile.src b/arch/m68k-amiga/boot/mmakefile.src index ccd372d1d6..401adace45 100644 --- a/arch/m68k-amiga/boot/mmakefile.src +++ b/arch/m68k-amiga/boot/mmakefile.src @@ -104,7 +104,8 @@ ext_entry.o: FORCE # USe -m68060 when compiling .S files, as we will need the # expanded instruction set to detect alterate CPUs -USER_AFLAGS := -march=68060 -DADATE="\"$(shell date "+%d.%m.%Y")\"" +USER_CPPFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" +USER_AFLAGS := -march=68060 # Sadly, we need to consume Chip RAM for the initial SS and the ROM BSS. # The initial System Stack is located at the end of the first 256K @@ -221,8 +222,8 @@ $(DISTDIR)/aros-amiga-m68k-%.bin : $(DISTDIR)/aros-amiga-m68k.elf $(HOSTGENDIR)/ clean :: -$(RM) $(TESTS) -USER_CFLAGS += $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -fno-delete-null-pointer-checks +USER_INCLUDES += $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) +USER_CFLAGS += -fno-delete-null-pointer-checks USER_AFLAGS += $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) $(KOBJSDIR)/%.o : %.c diff --git a/arch/m68k-amiga/c/mmakefile.src b/arch/m68k-amiga/c/mmakefile.src index 690cfd2041..aad49034d0 100644 --- a/arch/m68k-amiga/c/mmakefile.src +++ b/arch/m68k-amiga/c/mmakefile.src @@ -3,7 +3,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CPPFLAGS := -I$(GENINCDIR) -I$(SRCDIR) -DADATE="\"$(shell date "+%d.%m.%Y")\"" +USER_CPPFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" +USER_INCLUDES := -I$(GENINCDIR) -I$(SRCDIR) USER_CFLAGS := -fno-delete-null-pointer-checks USER_AFLAGS := -Os -march=68060 @@ -47,7 +48,7 @@ FILES := gdbstop CFILES := SetPatchAROS AFILES := newstackswap -USER_INCLUDES := -isystem $(SRCDIR)/rom/dos/include +USER_INCLUDES += -isystem $(SRCDIR)/rom/dos/include USER_LDFLAGS := -L$(GENDIR)/lib -static %build_prog mmake=workbench-c-m68k-setpatcharos progname=SetPatchAROS \ @@ -76,7 +77,7 @@ CFILES := SetPatch # Some Tests to check SetPatch functionality .. CFILES := test-cas -ISA_FLAGS += -mc68020 +ISA_FLAGS := $(ISA_MC68020_FLAGS) USER_LDFLAGS := %build_prog mmake=workbench-c-m68k-setpatch-testcas progname=test-CAS \ diff --git a/arch/m68k-amiga/cia/mmakefile.src b/arch/m68k-amiga/cia/mmakefile.src index 5aabe65a55..0de9c8fb84 100644 --- a/arch/m68k-amiga/cia/mmakefile.src +++ b/arch/m68k-amiga/cia/mmakefile.src @@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg FUNCTIONS := ableicr addicrvector remicrvector seticr -USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" %build_module_simple mmake=kernel-cia \ modname=cia modtype=resource \ diff --git a/arch/m68k-amiga/devs/cd/mmakefile.src b/arch/m68k-amiga/devs/cd/mmakefile.src index 1d138465ee..4744e0d14e 100644 --- a/arch/m68k-amiga/devs/cd/mmakefile.src +++ b/arch/m68k-amiga/devs/cd/mmakefile.src @@ -10,7 +10,7 @@ include $(SRCDIR)/config/aros.cfg FILES := cd cd32 -#USER_CFLAGS += -DDEBUG=1 +#USER_CPPFLAGS += -DDEBUG=1 %build_module mmake=kernel-amiga-m68k-cd \ modname=cd modtype=device \ diff --git a/arch/m68k-amiga/diag/mmakefile.src b/arch/m68k-amiga/diag/mmakefile.src index 4b0388c35c..50bc1e08f0 100644 --- a/arch/m68k-amiga/diag/mmakefile.src +++ b/arch/m68k-amiga/diag/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" %build_module_simple mmake=kernel-diag \ modname=diag modtype=hook \ diff --git a/arch/m68k-amiga/disk/mmakefile.src b/arch/m68k-amiga/disk/mmakefile.src index 903974c810..9f70c3ecec 100644 --- a/arch/m68k-amiga/disk/mmakefile.src +++ b/arch/m68k-amiga/disk/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/disk +USER_INCLUDES := -I$(SRCDIR)/rom/disk %build_archspecific \ mainmmake=kernel-disk maindir=rom/disk arch=amiga-m68k \ diff --git a/arch/m68k-amiga/exec/mmakefile.src b/arch/m68k-amiga/exec/mmakefile.src index a6b3d08d06..e490d3e13a 100644 --- a/arch/m68k-amiga/exec/mmakefile.src +++ b/arch/m68k-amiga/exec/mmakefile.src @@ -11,8 +11,9 @@ AFILES := enable disable readgayle #MM includes-asm_h-m68k \ #MM kernel-kernel-includes -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) -Os -USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) -Os +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) +USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) +OPTIMIZATION_CFLAGS := -Os %build_archspecific \ mainmmake=kernel-exec maindir=rom/exec arch=amiga-m68k \ diff --git a/arch/m68k-amiga/expansion/mmakefile.src b/arch/m68k-amiga/expansion/mmakefile.src index 1d71f1da90..1b9f14ea36 100644 --- a/arch/m68k-amiga/expansion/mmakefile.src +++ b/arch/m68k-amiga/expansion/mmakefile.src @@ -2,8 +2,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/expansion \ - -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_INCLUDES := -I$(SRCDIR)/rom/expansion +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" FUNCTIONS := readexpansionbyte readexpansionrom configchain configboard writeexpansionbyte writeexpansionword diff --git a/arch/m68k-amiga/graphics/mmakefile.src b/arch/m68k-amiga/graphics/mmakefile.src index 41b68fa461..b5299af6e7 100644 --- a/arch/m68k-amiga/graphics/mmakefile.src +++ b/arch/m68k-amiga/graphics/mmakefile.src @@ -9,8 +9,8 @@ AFILES := attemptlocklayerrom locklayerrom unlocklayerrom waitblit USER_INCLUDES := -I$(SRCDIR)/arch/$(CPU)-$(ARCH)/graphics \ -I$(SRCDIR)/rom/graphics -USER_CPPFLAGS := -D__GRAPHICS_NOHIDDBASE__ -USER_AFLAGS := -I$(GENINCDIR) -DDoRegisterCalls +USER_CPPFLAGS := -D__GRAPHICS_NOHIDDBASE__ -DDoRegisterCalls +USER_AFLAGS := -I$(GENINCDIR) ISA_FLAGS := $(ISA_MC68060_FLAGS) %build_archspecific \ diff --git a/arch/m68k-amiga/hidd/gfx/mmakefile.src b/arch/m68k-amiga/hidd/gfx/mmakefile.src index 9962ae32a8..552b53043e 100644 --- a/arch/m68k-amiga/hidd/gfx/mmakefile.src +++ b/arch/m68k-amiga/hidd/gfx/mmakefile.src @@ -7,7 +7,7 @@ include $(SRCDIR)/config/aros.cfg FILES := rgbconv AFILES := -USER_CFLAGS := -I$(SRCDIR)/rom/hidds/gfx +USER_INCLUDES := -I$(SRCDIR)/rom/hidds/gfx %build_archspecific \ mainmmake=kernel-hidd-gfx modname=gfx maindir=rom/hidds/gfx \ diff --git a/arch/m68k-amiga/hidd/keyboard/mmakefile.src b/arch/m68k-amiga/hidd/keyboard/mmakefile.src index 7868207d52..28c7e10f60 100644 --- a/arch/m68k-amiga/hidd/keyboard/mmakefile.src +++ b/arch/m68k-amiga/hidd/keyboard/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS += -D__UTILITY_NOLIBBASE__ -D__OOP_NOLIBBASE__ +USER_CPPFLAGS += -D__UTILITY_NOLIBBASE__ -D__OOP_NOLIBBASE__ %build_module mmake=kernel-amiga-m68k-kbd \ modname=amigakbd modtype=hidd \ diff --git a/arch/m68k-amiga/hidd/mouse/mmakefile.src b/arch/m68k-amiga/hidd/mouse/mmakefile.src index cf1d319988..c5fbd34344 100644 --- a/arch/m68k-amiga/hidd/mouse/mmakefile.src +++ b/arch/m68k-amiga/hidd/mouse/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg #MM- kernel-amiga-m68k-mouse : includes kernel-potgo-includes #MM- kernel-amiga-m68k-mouse-kobj : includes kernel-potgo-includes -USER_CFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__ +USER_CPPFLAGS += -D__OOP_NOLIBBASE__ -D__UTILITY_NOLIBBASE__ %build_module mmake=kernel-amiga-m68k-mouse \ modname=amigamouse modtype=hidd \ diff --git a/arch/m68k-amiga/hidd/parallel/mmakefile.src b/arch/m68k-amiga/hidd/parallel/mmakefile.src index df9377e31e..8cd1c61811 100644 --- a/arch/m68k-amiga/hidd/parallel/mmakefile.src +++ b/arch/m68k-amiga/hidd/parallel/mmakefile.src @@ -6,7 +6,7 @@ FILES := ParallelClass ParallelUnitClass #MM- workbench-devs-amiga-m68k: amiga-m68k-hidd-parallel -#USER_CLFAGS := -DDEBUG=1 +#USER_CPPLFAGS := -DDEBUG=1 USER_LDFLAGS := -static %build_module mmake=amiga-m68k-hidd-parallel \ diff --git a/arch/m68k-amiga/kernel/mmakefile.src b/arch/m68k-amiga/kernel/mmakefile.src index de2b4bc0f8..1ac9b3979f 100644 --- a/arch/m68k-amiga/kernel/mmakefile.src +++ b/arch/m68k-amiga/kernel/mmakefile.src @@ -7,9 +7,9 @@ FILES=cause cli sti kernel_debug kernel_timer maygetchar amiga_irq \ AFILES= -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -I$(GENINCDIR) -I$(AROS_DEVELOPER)/include \ - -DPARANOIA_STACK +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ + -I$(GENINCDIR) -I$(AROS_DEVELOPER)/include +USER_CPPFLAGS := -DPARANOIA_STACK USER_AFLAGS := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ -I$(GENINCDIR) -I$(AROS_DEVELOPER)/include diff --git a/arch/m68k-amiga/romboot/mmakefile.src b/arch/m68k-amiga/romboot/mmakefile.src index 7b179f3a91..a6dfbb5bee 100644 --- a/arch/m68k-amiga/romboot/mmakefile.src +++ b/arch/m68k-amiga/romboot/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" %build_module_simple mmake=kernel-romboot \ modname=romboot modtype=hook \ diff --git a/arch/m68k-amiga/wb.tag/mmakefile.src b/arch/m68k-amiga/wb.tag/mmakefile.src index cecb158037..47096fe8f6 100644 --- a/arch/m68k-amiga/wb.tag/mmakefile.src +++ b/arch/m68k-amiga/wb.tag/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" +USER_CPPFLAGS := -DADATE="\"$(shell date '+%d.%m.%Y')\"" %build_module_simple mmake=kernel-amiga-m68k-wbtag \ modname=wbtag modtype=resource \ diff --git a/arch/m68k-mac/exec/mmakefile.src b/arch/m68k-mac/exec/mmakefile.src index c61e45c2c1..f77594ac94 100644 --- a/arch/m68k-mac/exec/mmakefile.src +++ b/arch/m68k-mac/exec/mmakefile.src @@ -12,9 +12,13 @@ AFILES := coldreboot ints superstate sys_trap1_handler \ #MM kernel-exec-mac-m68k : kernel-exec-includes includes-asm_h-m68k -#USER_CFLAGS := -I../ $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) -D__AROS__ -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) -fomit-frame-pointer -O6 +#USER_INCLUDES := -I../ $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) +#USER_CPPFLAGS := -D__AROS__ +USER_INCLUDES += $(PRIV_EXEC_INCLUDES) +USER_CFLAGS := -fomit-frame-pointer +OPTIMIZATION_CFLAGS := -O6 USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) + %build_archspecific \ mainmmake=kernel-exec maindir=rom/exec arch=mac-m68k \ files=$(CFILES) asmfiles=$(AFILES) modname=exec diff --git a/arch/ppc-all/exec/mmakefile.src b/arch/ppc-all/exec/mmakefile.src index 8fb6630899..ac30a74976 100644 --- a/arch/ppc-all/exec/mmakefile.src +++ b/arch/ppc-all/exec/mmakefile.src @@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg USER_INCLUDES := $(PRIV_EXEC_INCLUDES) $(PRIV_KERNEL_INCLUDES) USER_AFLAGS := -I$(GENINCDIR) -USER_CFLAGS := -DHOST_OS_$(ARCH) +USER_CPPFLAGS := -DHOST_OS_$(ARCH) %build_archspecific \ mainmmake=kernel-exec maindir=rom/exec \ diff --git a/arch/ppc-all/kernel/mmakefile.src b/arch/ppc-all/kernel/mmakefile.src index d640f959d2..377cb10552 100644 --- a/arch/ppc-all/kernel/mmakefile.src +++ b/arch/ppc-all/kernel/mmakefile.src @@ -2,8 +2,9 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -I$(GENINCDIR) -D__AROS_EXEC_LIBRARY__ +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ + -I$(GENINCDIR) +USER_CPPFLAGS := -D__AROS_EXEC_LIBRARY__ %build_archspecific \ mainmmake=kernel-kernel maindir=rom/kernel \ diff --git a/arch/ppc-all/prep/kernel/mmakefile.src b/arch/ppc-all/prep/kernel/mmakefile.src index ad0cf82a39..ecb362b039 100644 --- a/arch/ppc-all/prep/kernel/mmakefile.src +++ b/arch/ppc-all/prep/kernel/mmakefile.src @@ -6,7 +6,7 @@ include $(SRCDIR)/config/aros.cfg # on the build on a real PPC/prep system. Other directories in the arch/ppc # directory will also need to be converted before the build will work. -USER_CFLAGS := -D__KERNEL__ -D__ROM__ +USER_CPPFLAGS := -D__KERNEL__ -D__ROM__ %build_module_macro mmake=kernel-resource-prep-ppc \ modname=kernel modtype=resource \ diff --git a/arch/ppc-chrp/battclock/mmakefile.src b/arch/ppc-chrp/battclock/mmakefile.src index 8132277932..00db7127f3 100644 --- a/arch/ppc-chrp/battclock/mmakefile.src +++ b/arch/ppc-chrp/battclock/mmakefile.src @@ -2,7 +2,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/battclock +USER_INCLUDES := -I$(SRCDIR)/rom/battclock + %build_archspecific \ mainmmake=kernel-battclock maindir=rom/battclock arch=chrp-ppc \ files="readbattclock writebattclock" modname=battclock diff --git a/arch/ppc-chrp/boot/openfirmware/src/mmakefile.src b/arch/ppc-chrp/boot/openfirmware/src/mmakefile.src index cfd3946031..cfa95c9211 100644 --- a/arch/ppc-chrp/boot/openfirmware/src/mmakefile.src +++ b/arch/ppc-chrp/boot/openfirmware/src/mmakefile.src @@ -7,7 +7,10 @@ FILES := bootstrap elf menu of1275 support gpr DEPS := $(foreach f, $(FILES), $(TARGETDIR)/$(f).d) OBJS := $(foreach f, $(FILES), $(TARGETDIR)/$(f).o) -USER_CFLAGS += -Os -ffreestanding -nostdlib -Wall -I$(SRCDIR)/$(CURDIR)/../include -DVERSION=\"94\" +USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../include +USER_CPPFLAGS := -DVERSION=\"94\" +USER_CFLAGS += -ffreestanding -nostdlib -Wall +OPTIMIZATION_CFLAGS := -Os #MM ub2lb-chrp-ppc-efika: linklibs ub2lb-chrp-ppc-efika: $(AROSDIR)/os_image diff --git a/arch/ppc-chrp/exec/mmakefile.src b/arch/ppc-chrp/exec/mmakefile.src index 31c037f01e..594da0a669 100644 --- a/arch/ppc-chrp/exec/mmakefile.src +++ b/arch/ppc-chrp/exec/mmakefile.src @@ -17,8 +17,10 @@ CFILES := \ #MM kernel-exec-chrp-ppc : kernel-kernel-ppc-includes kernel-exec-includes -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) -Os -USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) -Os +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) +USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) +OPTIMIZATION_CFLAGS := -Os + %build_archspecific \ mainmmake=kernel-exec maindir=rom/exec arch=chrp-ppc \ files=$(CFILES) modname=exec diff --git a/arch/ppc-native/processor/mmakefile.src b/arch/ppc-native/processor/mmakefile.src index f90c9292d9..952fe68425 100644 --- a/arch/ppc-native/processor/mmakefile.src +++ b/arch/ppc-native/processor/mmakefile.src @@ -10,7 +10,7 @@ FILES := \ #MM- kernel-processor-ppc : includes -USER_CFLAGS += -D__UTILITY_NOLIBBASE__ +USER_CPPFLAGS += -D__UTILITY_NOLIBBASE__ %build_archspecific mainmmake=kernel-processor maindir=rom/processor \ arch=ppc files=$(FILES) modname=processor diff --git a/arch/ppc-sam440/ata/mmakefile.src b/arch/ppc-sam440/ata/mmakefile.src index c0ea36dbb5..8b30289916 100644 --- a/arch/ppc-sam440/ata/mmakefile.src +++ b/arch/ppc-sam440/ata/mmakefile.src @@ -4,7 +4,7 @@ include $(SRCDIR)/config/aros.cfg USER_INCLUDES := -I.. -I$(SRCDIR)/rom/devs/ata -USER_CFLAGS += -D__TIMER_NOLIBBASE__ +USER_CPPFLAGS += -D__TIMER_NOLIBBASE__ FILES := bus_ppc460 diff --git a/arch/ppc-sam440/battclock/mmakefile.src b/arch/ppc-sam440/battclock/mmakefile.src index f942e30616..b348d9ede1 100644 --- a/arch/ppc-sam440/battclock/mmakefile.src +++ b/arch/ppc-sam440/battclock/mmakefile.src @@ -2,7 +2,8 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/battclock +USER_INCLUDES := -I$(SRCDIR)/rom/battclock + %build_archspecific \ mainmmake=kernel-battclock maindir=rom/battclock arch=sam440-ppc \ files="readbattclock writebattclock" modname=battclock diff --git a/arch/ppc-sam440/boot/parthenope/src/mmakefile.src b/arch/ppc-sam440/boot/parthenope/src/mmakefile.src index ac9ee1cd26..728a51feb3 100644 --- a/arch/ppc-sam440/boot/parthenope/src/mmakefile.src +++ b/arch/ppc-sam440/boot/parthenope/src/mmakefile.src @@ -7,7 +7,9 @@ FILES := parthenope cdrom context dos elf ext2 menu rdb sfs support tftp DEPS := $(foreach f, $(FILES), $(TARGETDIR)/$(f).d) OBJS := $(foreach f, $(FILES), $(TARGETDIR)/$(f).o) -USER_CFLAGS += -DUSE_UBOOT -ffixed-r2 -ffixed-r14 -ffixed-r29 -Wall -fno-builtin -nostdinc -nostdlib -DIN_PARTHENOPE -O2 -DVERSION=\"91\" -DDATE=\"`date +%-d.%-m.%Y`\" -g3 +USER_CPPFLAGS += -DUSE_UBOOT -DIN_PARTHENOPE -DVERSION=\"91\" -DDATE=\"`date +%-d.%-m.%Y`\" +USER_CFLAGS += -ffixed-r2 -ffixed-r14 -ffixed-r29 -Wall $(CFLAGS_NO_BUILTIN) -nostdinc -nostdlib -g3 +OPTIMIZATION_CFLAGS := -O2 #MM parthenope-sam440: parthenope-sam440: $(AROSDIR)/Parthenope diff --git a/arch/ppc-sam440/debug/mmakefile.src b/arch/ppc-sam440/debug/mmakefile.src index 14b2fd1fed..2c288bf665 100644 --- a/arch/ppc-sam440/debug/mmakefile.src +++ b/arch/ppc-sam440/debug/mmakefile.src @@ -7,7 +7,7 @@ CFILES := \ #MM kernel-debug-sam440-ppc : kernel-kernel-ppc-includes kernel-debug-includes -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) \ +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) \ -I$(SRCDIR)/rom/debug %build_archspecific \ diff --git a/arch/ppc-sam440/exec/mmakefile.src b/arch/ppc-sam440/exec/mmakefile.src index 6a071ee678..0f3d43e4f3 100644 --- a/arch/ppc-sam440/exec/mmakefile.src +++ b/arch/ppc-sam440/exec/mmakefile.src @@ -9,7 +9,7 @@ CFILES := \ #MM kernel-exec-sam440-ppc : kernel-kernel-ppc-includes kernel-exec-includes kernel-kernel-includes -USER_CFLAGS := $(PRIV_EXEC_INCLUDES) +USER_INCLUDES := $(PRIV_EXEC_INCLUDES) USER_AFLAGS := $(PRIV_EXEC_INCLUDES) -I$(GENINCDIR) %build_archspecific \ diff --git a/arch/ppc-sam440/processor/mmakefile.src b/arch/ppc-sam440/processor/mmakefile.src index 31515c4542..d5df0614f1 100644 --- a/arch/ppc-sam440/processor/mmakefile.src +++ b/arch/ppc-sam440/processor/mmakefile.src @@ -3,14 +3,14 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -I$(SRCDIR)/rom/processor +USER_INCLUDES := -I$(SRCDIR)/rom/processor FILES := \ processor_init \ #MM- kernel-processor-ppc : includes -USER_CFLAGS += -D__UTILITY_NOLIBBASE__ +USER_CPPFLAGS += -D__UTILITY_NOLIBBASE__ USER_INCLUDES += -I$(SRCDIR)/arch/ppc-native/processor diff --git a/arch/x86_64-all/kernel/mmakefile.src b/arch/x86_64-all/kernel/mmakefile.src index 7888d3f1a6..b06fe6c677 100644 --- a/arch/x86_64-all/kernel/mmakefile.src +++ b/arch/x86_64-all/kernel/mmakefile.src @@ -4,8 +4,9 @@ include $(SRCDIR)/config/aros.cfg FILES := cpu_init createcontext -USER_CFLAGS := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ - -I$(GENINCDIR) -D__AROS_EXEC_LIBRARY__ +USER_INCLUDES := $(PRIV_KERNEL_INCLUDES) $(PRIV_EXEC_INCLUDES) \ + -I$(GENINCDIR) +USER_CPPFLAGS := -D__AROS_EXEC_LIBRARY__ %build_archspecific \ mainmmake=kernel-kernel maindir=rom/kernel \ diff --git a/compiler/coolimages/mmakefile.src b/compiler/coolimages/mmakefile.src index d5aaa9c582..be7e73f60e 100644 --- a/compiler/coolimages/mmakefile.src +++ b/compiler/coolimages/mmakefile.src @@ -26,7 +26,7 @@ FILES := saveimage \ buttonclass \ imageclass -USER_CFLAGS := -I$(SRCDIR)/$(CURDIR)/include +USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/include #MM- linklibs : linklibs-coolimagesstatic #MM linklibs-coolimagesstatic : includes diff --git a/compiler/stdc/mmakefile.src b/compiler/stdc/mmakefile.src index 92044122b5..ebb1d448ef 100644 --- a/compiler/stdc/mmakefile.src +++ b/compiler/stdc/mmakefile.src @@ -621,7 +621,7 @@ STDC_STATIC := \ vsprintf \ vsscanf -USER_CFLAGS := $(NOWARN_FLAGS) -fno-builtin +USER_CFLAGS := $(NOWARN_FLAGS) $(CFLAGS_NO_BUILTIN) USER_CPPFLAGS := -DSTDC_STATIC -Dlint #MM- core-linklibs : linklibs-stdc-static diff --git a/rom/lddemon/mmakefile.src b/rom/lddemon/mmakefile.src index b3df706517..36514b9138 100644 --- a/rom/lddemon/mmakefile.src +++ b/rom/lddemon/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS += -D__DOS_NOLIBBASE__ +USER_CPPFLAGS += -D__DOS_NOLIBBASE__ USER_LDFLAGS := -static %build_module mmake=kernel-lddemon \ diff --git a/workbench/c/Shell/mmakefile.src b/workbench/c/Shell/mmakefile.src index 7b0d60b73a..d919c16b19 100644 --- a/workbench/c/Shell/mmakefile.src +++ b/workbench/c/Shell/mmakefile.src @@ -22,7 +22,7 @@ FILES := \ redirection \ readLine -USER_CFLAGS += -DADATE="\"$(shell date "+%d.%m.%Y")\"" \ +USER_CPPFLAGS += -DADATE="\"$(shell date "+%d.%m.%Y")\"" \ -D__DOS_NOLIBBASE__ USER_LDFLAGS := -static @@ -36,11 +36,11 @@ USER_LDFLAGS := -static files=$(FILES) targetdir=$(AROS_FS) \ usestartup="no" -USER_CFLAGS += -DUSE_EMBEDDED_COMMANDS +USER_CPPFLAGS += -DUSE_EMBEDDED_COMMANDS ifeq ($(AROS_TARGET_CPU),m68k) # Make sure we optimize this code for size on m68k.. OPTIMIZATION_CFLAGS := -Os -USER_CFLAGS += -D__DOS_NOLIBINLINE__ +USER_CPPFLAGS += -D__DOS_NOLIBINLINE__ endif OBJDIR := $(OBJDIR).kernel diff --git a/workbench/c/Unpack/mmakefile.src b/workbench/c/Unpack/mmakefile.src index adfff8202b..929f768738 100644 --- a/workbench/c/Unpack/mmakefile.src +++ b/workbench/c/Unpack/mmakefile.src @@ -6,7 +6,7 @@ include $(SRCDIR)/config/aros.cfg FILES := unpack gui package bzip2 file support EXEDIR := $(AROS_C) -USER_CFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" +USER_CPPFLAGS := -DADATE="\"$(shell date "+%d.%m.%Y")\"" #MM- workbench-c : workbench-c-unpack #MM workbench-c-unpack : includes linklibs external-bz2 diff --git a/workbench/classes/datatypes/8svx/mmakefile.src b/workbench/classes/datatypes/8svx/mmakefile.src index a8bcc21cf2..a1bb570107 100644 --- a/workbench/classes/datatypes/8svx/mmakefile.src +++ b/workbench/classes/datatypes/8svx/mmakefile.src @@ -8,7 +8,7 @@ FILES := 8svxclass #MM workbench-datatypes-8svx : includes linklibs -USER_CFLAGS := -DMYDEBUG +USER_CPPFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-8svx \ modname=8svx modtype=datatype \ diff --git a/workbench/classes/datatypes/amigaguide/mmakefile.src b/workbench/classes/datatypes/amigaguide/mmakefile.src index fe33c74912..31330b3cf9 100644 --- a/workbench/classes/datatypes/amigaguide/mmakefile.src +++ b/workbench/classes/datatypes/amigaguide/mmakefile.src @@ -2,14 +2,14 @@ include $(SRCDIR)/config/aros.cfg -USER_LDFLAGS := -static - FILES := amigaguideclass nodeclass file util process navigator #MM workbench-datatypes-amigaguide : includes linklibs \ #MM workbench-libs-rexxsyslib -USER_CFLAGS := -DCOMPILE_DATATYPE -DMORPHOS_AG_EXTENSION -I$(SRCDIR)/$(CURDIR)/include +USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/include +USER_CPPFLAGS := -DCOMPILE_DATATYPE -DMORPHOS_AG_EXTENSION +USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-amigaguide \ modname=amigaguide modtype=datatype \ diff --git a/workbench/classes/datatypes/animation/mmakefile.src b/workbench/classes/datatypes/animation/mmakefile.src index c542acb610..a6df790d4e 100644 --- a/workbench/classes/datatypes/animation/mmakefile.src +++ b/workbench/classes/datatypes/animation/mmakefile.src @@ -7,7 +7,7 @@ FILES := animationclass animationbuffer animationframe animationplayback animati #MM- workbench-datatypes-animation : workbench-datatype-animation #MM workbench-datatype-animation : includes linklibs workbench-datatype-animation-envarc -USER_CFLAGS := -DDEBUG=0 +USER_CPPFLAGS := -DDEBUG=0 USER_LDFLAGS := -static %build_module mmake=workbench-datatype-animation \ diff --git a/workbench/classes/datatypes/bmp/mmakefile.src b/workbench/classes/datatypes/bmp/mmakefile.src index 33a3768e4c..b2852714d2 100644 --- a/workbench/classes/datatypes/bmp/mmakefile.src +++ b/workbench/classes/datatypes/bmp/mmakefile.src @@ -8,7 +8,7 @@ FILES := bmpclass #MM workbench-datatypes-bmp : includes linklibs -USER_CFLAGS := -DMYDEBUG +USER_CPPFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-bmp \ modname=bmp modtype=datatype \ diff --git a/workbench/classes/datatypes/gif/mmakefile.src b/workbench/classes/datatypes/gif/mmakefile.src index 3cfc70238e..2ac8046e98 100644 --- a/workbench/classes/datatypes/gif/mmakefile.src +++ b/workbench/classes/datatypes/gif/mmakefile.src @@ -8,7 +8,7 @@ FILES := gifclass codeclzw #MM workbench-datatypes-gif : includes linklibs -USER_CFLAGS := -DMYDEBUG +USER_CPPFLAGS := -DMYDEBUG %build_module mmake=workbench-datatypes-gif \ modname=gif modtype=datatype \ diff --git a/workbench/classes/datatypes/ilbm/mmakefile.src b/workbench/classes/datatypes/ilbm/mmakefile.src index 93321ff4e1..ebe385524b 100644 --- a/workbench/classes/datatypes/ilbm/mmakefile.src +++ b/workbench/classes/datatypes/ilbm/mmakefile.src @@ -6,7 +6,7 @@ FILES := ilbmclass #MM workbench-datatypes-ilbm : includes linklibs -USER_CFLAGS := -DMYDEBUG +USER_CPPFLAGS := -DMYDEBUG USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-ilbm \ diff --git a/workbench/classes/datatypes/jpeg/mmakefile.src b/workbench/classes/datatypes/jpeg/mmakefile.src index 23113ba5e0..dc19e99d5d 100644 --- a/workbench/classes/datatypes/jpeg/mmakefile.src +++ b/workbench/classes/datatypes/jpeg/mmakefile.src @@ -2,14 +2,13 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DMYDEBUG - FILES := jpegclass stubs memory #MM- workbench-datatypes-complete: workbench-datatypes-jpeg #MM workbench-datatypes-jpeg : includes linklibs workbench-libs-jpeg-linklib -USER_CFLAGS := -DAROS_LC_SETFUNCS +USER_CPPFLAGS := -DMYDEBUG +USER_CPPFLAGS += -DAROS_LC_SETFUNCS USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-jpeg \ diff --git a/workbench/classes/datatypes/picture/mmakefile.src b/workbench/classes/datatypes/picture/mmakefile.src index 6f27b10a86..862c2c8e3e 100644 --- a/workbench/classes/datatypes/picture/mmakefile.src +++ b/workbench/classes/datatypes/picture/mmakefile.src @@ -6,7 +6,8 @@ FILES := pictureclass colorhandling prefs #MM workbench-datatypes-picture : includes linklibs -USER_CFLAGS := -DCOMPILE_DATATYPE -DMYDEBUG $(CFLAGS_NO_INLINE_SMALL_FUNCTIONS) +USER_CPPFLAGS := -DCOMPILE_DATATYPE -DMYDEBUG +USER_CFLAGS := $(CFLAGS_NO_INLINE_SMALL_FUNCTIONS) USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-picture \ diff --git a/workbench/classes/datatypes/png/mmakefile.src b/workbench/classes/datatypes/png/mmakefile.src index 0ba6ccb501..9557b0bd4d 100644 --- a/workbench/classes/datatypes/png/mmakefile.src +++ b/workbench/classes/datatypes/png/mmakefile.src @@ -7,7 +7,7 @@ FILES := pngclass memory directaccess #MM- workbench-datatypes-complete: workbench-datatypes-png #MM workbench-datatypes-png : includes linklibs workbench-libs-z workbench-libs-png-linklib -USER_CFLAGS := -DMYDEBUG +USER_CPPFLAGS := -DMYDEBUG USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-png \ diff --git a/workbench/classes/datatypes/sound/mmakefile.src b/workbench/classes/datatypes/sound/mmakefile.src index 958e90ca17..3ecb09b9c6 100644 --- a/workbench/classes/datatypes/sound/mmakefile.src +++ b/workbench/classes/datatypes/sound/mmakefile.src @@ -6,7 +6,7 @@ FILES := dispatch sound_init #MM workbench-datatypes-sound : includes linklibs workbench-devs-AHI -USER_CFLAGS := -I$(GENDIR)/workbench/devs/AHI/Include/gcc +USER_INCLUDES := -I$(GENDIR)/workbench/devs/AHI/Include/gcc USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-sound \ diff --git a/workbench/classes/datatypes/text/mmakefile.src b/workbench/classes/datatypes/text/mmakefile.src index c09d16ae1d..6f5afd7a78 100644 --- a/workbench/classes/datatypes/text/mmakefile.src +++ b/workbench/classes/datatypes/text/mmakefile.src @@ -2,13 +2,12 @@ include $(SRCDIR)/config/aros.cfg -USER_LDFLAGS := -static - FILES := textclass support agextension #MM workbench-datatypes-text : includes linklibs -USER_CFLAGS := -DCOMPILE_DATATYPE -DMORPHOS_AG_EXTENSION +USER_CPPFLAGS := -DCOMPILE_DATATYPE -DMORPHOS_AG_EXTENSION +USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-text \ modname=text modtype=datatype \ diff --git a/workbench/classes/datatypes/wav/mmakefile.src b/workbench/classes/datatypes/wav/mmakefile.src index 4696c371ae..19d30d9a12 100644 --- a/workbench/classes/datatypes/wav/mmakefile.src +++ b/workbench/classes/datatypes/wav/mmakefile.src @@ -2,6 +2,8 @@ include $(SRCDIR)/config/aros.cfg +#MM workbench-datatypes-wave : includes linklibs linklibs-gsm + G72XFILES := \ wave_g72x \ g72x/g72x \ @@ -29,9 +31,8 @@ FILES := \ broke := init -#MM workbench-datatypes-wave : includes linklibs linklibs-gsm - -USER_CFLAGS := -DGSM610_SUPPORT -DG72X_SUPPORT -I$(SRCDIR)/$(CURDIR)/include +USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/include +USER_CPPFLAGS := -DGSM610_SUPPORT -DG72X_SUPPORT USER_LDFLAGS := -static %build_module mmake=workbench-datatypes-wave \ diff --git a/workbench/classes/gadgets/tapedeck/mmakefile.src b/workbench/classes/gadgets/tapedeck/mmakefile.src index 11eca27cee..0620c1d298 100644 --- a/workbench/classes/gadgets/tapedeck/mmakefile.src +++ b/workbench/classes/gadgets/tapedeck/mmakefile.src @@ -2,7 +2,7 @@ include $(SRCDIR)/config/aros.cfg -USER_CFLAGS := -DDEBUG=0 +USER_CPPFLAGS := -DDEBUG=0 USER_LDFLAGS := -static FILES := tapedeckclass diff --git a/workbench/classes/zune/aboutwindow/mmakefile.src b/workbench/classes/zune/aboutwindow/mmakefile.src index 240163e51d..67ea856c91 100644 --- a/workbench/classes/zune/aboutwindow/mmakefile.src +++ b/workbench/classes/zune/aboutwindow/mmakefile.src @@ -9,6 +9,7 @@ INCLUDE_FILES := aboutwindow.h #MM- workbench-classes-zune : workbench-classes-zune-aboutwindow #MM workbench-classes-zune-aboutwindow : workbench-classes-zune-aboutwindow-catalogs + %build_module \ mmake=workbench-classes-zune-aboutwindow \ modname=AboutWindow modtype=mcc \ diff --git a/workbench/classes/zune/betterstring/mcc/mmakefile.src b/workbench/classes/zune/betterstring/mcc/mmakefile.src index 169bb24aa6..35960e4455 100644 --- a/workbench/classes/zune/betterstring/mcc/mmakefile.src +++ b/workbench/classes/zune/betterstring/mcc/mmakefile.src @@ -21,7 +21,7 @@ FILES := \ Debug USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG +USER_CPPFLAGS := -DNO_INLINE_STDARG %build_prog mmake=workbench-classes-zune-betterstring-test \ progname=BetterString-Test files="BetterString-Test $(FILES)" \ @@ -30,7 +30,7 @@ USER_CFLAGS := -DNO_INLINE_STDARG # We need to use -idirafter, so that we # *don't* pick up the project's local MUI headers. USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../mcp -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DAROS_ABI_V1 +USER_CPPFLAGS := -DAROS_ABI_V1 USER_LDFLAGS := -static %build_module_simple mmake=workbench-classes-zune-betterstring-class \ diff --git a/workbench/classes/zune/betterstring/mcp/mmakefile.src b/workbench/classes/zune/betterstring/mcp/mmakefile.src index 2053939477..daedcbe07f 100644 --- a/workbench/classes/zune/betterstring/mcp/mmakefile.src +++ b/workbench/classes/zune/betterstring/mcp/mmakefile.src @@ -8,7 +8,7 @@ include $(SRCDIR)/config/aros.cfg #MM workbench-classes-zune-betterstring-mcp-locale USER_INCLUDES := -I$(TOP)/$(CURDIR) -idirafter $(SRCDIR)/$(CURDIR)/../include -I$(SRCDIR)/$(CURDIR)/../mcc -USER_CFLAGS := -DAROS_ABI_V1 +USER_CPPFLAGS := -DAROS_ABI_V1 USER_LDFLAGS := -static FILES := library \ diff --git a/workbench/classes/zune/nlist/nbalance_mcc/mmakefile.src b/workbench/classes/zune/nlist/nbalance_mcc/mmakefile.src index b6b0294bf8..9682642662 100644 --- a/workbench/classes/zune/nlist/nbalance_mcc/mmakefile.src +++ b/workbench/classes/zune/nlist/nbalance_mcc/mmakefile.src @@ -6,7 +6,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nbalance-test : includes linklibs USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 +USER_CPPFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nbitmap_mcc/mmakefile.src b/workbench/classes/zune/nlist/nbitmap_mcc/mmakefile.src index 598859c278..035880b836 100644 --- a/workbench/classes/zune/nlist/nbitmap_mcc/mmakefile.src +++ b/workbench/classes/zune/nlist/nbitmap_mcc/mmakefile.src @@ -6,7 +6,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nbitmap-test : includes linklibs classes-zune-nbitmap-test-cpy USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 +USER_CPPFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nfloattext_mcc/mmakefile.src b/workbench/classes/zune/nlist/nfloattext_mcc/mmakefile.src index b7dc81a0ee..745c390dd7 100644 --- a/workbench/classes/zune/nlist/nfloattext_mcc/mmakefile.src +++ b/workbench/classes/zune/nlist/nfloattext_mcc/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nfloattext-class : setup includes linklibs classes-zune-nlist USER_INCLUDES = -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 +USER_CPPFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nlist_mcc/mmakefile.src b/workbench/classes/zune/nlist/nlist_mcc/mmakefile.src index 6da0c434a7..d8b132322d 100644 --- a/workbench/classes/zune/nlist/nlist_mcc/mmakefile.src +++ b/workbench/classes/zune/nlist/nlist_mcc/mmakefile.src @@ -30,7 +30,7 @@ FILES := \ USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -I$(SRCDIR)/$(CURDIR)/../nlistviews_mcp \ -idirafter $(SRCDIR)/$(CURDIR)/../include/mui -USER_CFLAGS := -DAROS_ABI_V1 +USER_CPPFLAGS := -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nlisttree_mcc/mmakefile.src b/workbench/classes/zune/nlist/nlisttree_mcc/mmakefile.src index 4649efc874..ec2106d4d8 100644 --- a/workbench/classes/zune/nlist/nlisttree_mcc/mmakefile.src +++ b/workbench/classes/zune/nlist/nlisttree_mcc/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nlisttree-class : includes linklibs USER_INCLUDES = -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 +USER_CPPFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nlisttree_mcp/mmakefile.src b/workbench/classes/zune/nlist/nlisttree_mcp/mmakefile.src index d0e7307229..b1ad706098 100644 --- a/workbench/classes/zune/nlist/nlisttree_mcp/mmakefile.src +++ b/workbench/classes/zune/nlist/nlisttree_mcp/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nlisttree-mcp : includes linklibs classes-zune-nlisttree-mcp-catalogs USER_INCLUDES = -idirafter $(SRCDIR)/$(CURDIR)/../include -USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 +USER_CPPFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nlistview_mcc/mmakefile.src b/workbench/classes/zune/nlist/nlistview_mcc/mmakefile.src index 00d9e70596..db6c93b1d7 100644 --- a/workbench/classes/zune/nlist/nlistview_mcc/mmakefile.src +++ b/workbench/classes/zune/nlist/nlistview_mcc/mmakefile.src @@ -5,7 +5,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nlistview-class : includes linklibs USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -idirafter $(SRCDIR)/$(CURDIR)/../include/mui -I$(SRCDIR)/$(CURDIR)/../nlistviews_mcp -USER_CFLAGS := -DAROS_ABI_V1 +USER_CPPFLAGS := -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/nlist/nlistviews_mcp/mmakefile.src b/workbench/classes/zune/nlist/nlistviews_mcp/mmakefile.src index 5d6d541e7b..ef59f1a050 100644 --- a/workbench/classes/zune/nlist/nlistviews_mcp/mmakefile.src +++ b/workbench/classes/zune/nlist/nlistviews_mcp/mmakefile.src @@ -6,7 +6,7 @@ include $(SRCDIR)/config/aros.cfg #MM classes-zune-nlistviews-mcp-test : includes linklibs USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -I$(SRCDIR)/$(CURDIR)/../nlistview_mcc -USER_CFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 +USER_CPPFLAGS := -DNO_INLINE_STDARG -DAROS_ABI_V1 USER_CFLAGS += $(PARANOIA_CFLAGS) USER_LDFLAGS := -static diff --git a/workbench/classes/zune/texteditor/mcc/mmakefile.src b/workbench/classes/zune/texteditor/mcc/mmakefile.src index 9253fdf1f9..760d3f4f1c 100644 --- a/workbench/classes/zune/texteditor/mcc/mmakefile.src +++ b/workbench/classes/zune/texteditor/mcc/mmakefile.src @@ -8,7 +8,7 @@ include $(SRCDIR)/config/aros.cfg # We need to use -idirafter, so that we # *don't* pick up the project's local MUI headers. USER_INCLUDES := -idirafter $(SRCDIR)/$(CURDIR)/../include -I$(SRCDIR)/$(CURDIR)/../mcp -USER_CFLAGS := -DAROS_ABI_V1 +USER_CPPFLAGS := -DAROS_ABI_V1 USER_LDFLAGS := -static FILES := library \ diff --git a/workbench/classes/zune/texteditor/mcp/mmakefile.src b/workbench/classes/zune/texteditor/mcp/mmakefile.src index 079d74bd78..a01069d03a 100644 --- a/workbench/classes/zune/texteditor/mcp/mmakefile.src +++ b/workbench/classes/zune/texteditor/mcp/mmakefile.src @@ -14,7 +14,7 @@ include $(SRCDIR)/config/aros.cfg # We need to use -idirafter, so that we # *don't* pick up the project's local MUI headers. USER_INCLUDES = -idirafter $(SRCDIR)/$(CURDIR)/../include -I$(TOP)/$(CURDIR)/ -I$(SRCDIR)/$(CURDIR)/../mcc -USER_CFLAGS := -DAROS_ABI_V1 +USER_CPPFLAGS := -DAROS_ABI_V1 USER_LDFLAGS := -static FILES := library \ diff --git a/workbench/demos/mmakefile.src b/workbench/demos/mmakefile.src index c179cae7e3..1555c68c77 100644 --- a/workbench/demos/mmakefile.src +++ b/workbench/demos/mmakefile.src @@ -66,7 +66,7 @@ FILES := \ window \ winshape -USER_CFLAGS := -I$(SRCDIR)/workbench/libs +USER_INCLUDES := -I$(SRCDIR)/workbench/libs #MM demos :includes linklibs demos-images-setup workbench-demos-zune diff --git a/workbench/devs/audio/mmakefile.src b/workbench/devs/audio/mmakefile.src index ca16b31fad..04696e674d 100644 --- a/workbench/devs/audio/mmakefile.src +++ b/workbench/devs/audio/mmakefile.src @@ -15,7 +15,7 @@ FILES := libfunctions audio_commands objpoollite audio_esys #MM- workbench-devs-eaudio : includes linklibs workbench-devs-AHI -USER_CFLAGS := -I$(SRCDIR)/workbench/devs/AHI/Include/C +USER_INCLUDES := -I$(SRCDIR)/workbench/devs/AHI/Include/C USER_LDFLAGS := -static %build_module mmake=workbench-devs-eaudio \ diff --git a/workbench/libs/freetype/src/mmakefile.src b/workbench/libs/freetype/src/mmakefile.src index 9b71680996..e0876bea9b 100644 --- a/workbench/libs/freetype/src/mmakefile.src +++ b/workbench/libs/freetype/src/mmakefile.src @@ -66,11 +66,24 @@ USER_CPPFLAGS := -DFT2_BUILD_LIBRARY #MM workbench-libs-freetype-module : workbench-libs-freetype-includes #MM- workbench-libs-freetype-linklibs : workbench-libs-freetype-linklib workbench-libs-freetype-module-linklib -%build_linklib mmake=workbench-libs-freetype-linklib libname=freetype2.static \ - files=$(FT2FILES) objdir=$(OBJDIR)/static +BASENAME=freetype2 +TARGETNAME=$(BASENAME) +#ifeq ($(AROS_TARGET_CPU),m68k) +# TARGET_ISA:=MC68020 +# +# TARGET_ISA_EXT=$(ISA_$(TARGET_ISA)_EXT) +# +# ISA_FLAGS := $(ISA_$(TARGET_ISA)_FLAGS) +# TARGET_CPPFLAGS+= $(ISA_$(TARGET_ISA)_CPPFLAGS) +# TARGET_CFLAGS+= $(ISA_$(TARGET_ISA)_CFLAGS) +# TARGET_LDFLAGS+= $(ISA_$(TARGET_ISA)_LDFLAGS) +#endif -%build_module mmake=workbench-libs-freetype-module modname=freetype2 \ - modtype=library files="$(SHFILES) $(FT2FILES)" uselibs="stdc" +%build_linklib mmake=workbench-libs-freetype-linklib libname=$(TARGETNAME).static \ + files=$(FT2FILES) objdir=$(OBJDIR)/$(TARGETNAME)_static + +%build_module mmake=workbench-libs-freetype-module modname=$(TARGETNAME) flavour=$(TARGET_ISA_EXT) \ + modtype=library files="$(SHFILES) $(FT2FILES)" uselibs="stdc" conffile=freetype2.conf #MM workbench-libs-freetype-pkgconfig : $(AROS_LIB)/pkgconfig/freetype2.pc -- 2.11.4.GIT