From 3dcdacfae72211065026a3e45c65e8108d77d750 Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Sun, 21 Jan 2007 04:04:51 +0000 Subject: [PATCH] Fix a bug in the make system that must have started showing up with some newer version of make. Also set the proper include path for a lot of busted makefiles git-svn-id: svn+ssh://newos.org/var/svn/newos/newos@1239 c25cc9d1-44fa-0310-b259-ad778cb1d433 --- boot/pc/i386/config.ini | 2 +- boot/pc/i386/makefile | 12 ++++++------ kernel/addons/dev/console/makefile | 2 +- kernel/addons/dev/disk/floppy/makefile | 2 +- kernel/addons/dev/disk/ide/makefile | 2 +- kernel/addons/dev/disk/ide2/makefile | 2 +- kernel/addons/dev/disk/ide3/makefile | 2 +- kernel/addons/dev/disk/netblock/makefile | 2 +- kernel/addons/dev/graphics/vesa/makefile | 2 +- kernel/addons/dev/input/pckeyboard/makefile | 2 +- kernel/addons/dev/input/ps2mouse/makefile | 2 +- kernel/addons/dev/net/ns83820/makefile | 2 +- kernel/addons/dev/net/pcnet32/makefile | 2 +- kernel/addons/dev/net/rhine/makefile | 2 +- kernel/addons/dev/net/rtl8139/makefile | 2 +- kernel/addons/dev/net/rtl8169/makefile | 2 +- kernel/addons/dev/tty/makefile | 2 +- kernel/addons/modules/bus_managers/ide/makefile | 2 +- kernel/addons/modules/bus_managers/isa/makefile | 2 +- kernel/addons/modules/bus_managers/pci/makefile | 2 +- kernel/addons/modules/bus_managers/scsi/makefile | 2 +- kernel/addons/modules/bus_managers/usb/makefile | 2 +- kernel/addons/modules/console/fb_console/makefile | 2 +- kernel/addons/modules/console/vga_text/makefile | 2 +- kernel/addons/modules/console/vmware/makefile | 2 +- kernel/addons/modules/generic/blkman/makefile | 2 +- kernel/addons/modules/generic/locked_pool/makefile | 2 +- kernel/addons/modules/generic/scsi_periph/makefile | 2 +- 28 files changed, 33 insertions(+), 33 deletions(-) diff --git a/boot/pc/i386/config.ini b/boot/pc/i386/config.ini index 3fcc823..d1904d1 100644 --- a/boot/pc/i386/config.ini +++ b/boot/pc/i386/config.ini @@ -6,7 +6,7 @@ # [bootstrap] type=elf32 -file=build/i386-pc/boot/stage2 +file=build/i386-pc/boot/stage2/stage2 [kernel] type=elf32 diff --git a/boot/pc/i386/makefile b/boot/pc/i386/makefile index 853931b..1370d7f 100644 --- a/boot/pc/i386/makefile +++ b/boot/pc/i386/makefile @@ -2,7 +2,7 @@ BOOT_SRCDIR := $(GET_LOCAL_DIR) BOOT_TARGETDIR := $(call TOBUILDDIR, boot) -STAGE2 := $(BOOT_TARGETDIR)/stage2 +STAGE2 := $(BOOT_TARGETDIR)/stage2/stage2 ifeq ($(OSTYPE),cygwin) BOOT_IMAGE_TARGET ?= a: @@ -11,7 +11,7 @@ else endif # make a rule for the stage2 -MY_TARGETDIR := $(BOOT_TARGETDIR) +MY_TARGETDIR := $(BOOT_TARGETDIR)/stage2 MY_SRCDIR := $(BOOT_SRCDIR) MY_TARGET := $(STAGE2) MY_OBJS := \ @@ -32,10 +32,10 @@ MY_GLUE := include templates/app.mk -STAGE1 = $(BOOT_TARGETDIR)/stage1 +STAGE1 = $(BOOT_TARGETDIR)/stage1/stage1 # rules for stage1 -MY_TARGETDIR := $(BOOT_TARGETDIR) +MY_TARGETDIR := $(BOOT_TARGETDIR)/stage1 MY_SRCDIR := $(BOOT_SRCDIR) MY_TARGET := $(STAGE1).elf MY_OBJS := \ @@ -54,9 +54,9 @@ MY_GLUE := include templates/app.mk # rules to build the bootblock -BOOTBLOCK = $(BOOT_TARGETDIR)/bootblock +BOOTBLOCK = $(BOOT_TARGETDIR)/bootblock/bootblock -MY_TARGETDIR := $(BOOT_TARGETDIR) +MY_TARGETDIR := $(BOOT_TARGETDIR)/bootblock MY_SRCDIR := $(BOOT_SRCDIR) MY_TARGET := $(BOOTBLOCK).elf MY_OBJS := \ diff --git a/kernel/addons/dev/console/makefile b/kernel/addons/dev/console/makefile index 8310212..ce57a22 100644 --- a/kernel/addons/dev/console/makefile +++ b/kernel/addons/dev/console/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS += \ console.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/disk/floppy/makefile b/kernel/addons/dev/disk/floppy/makefile index b4104a9..250ebb5 100644 --- a/kernel/addons/dev/disk/floppy/makefile +++ b/kernel/addons/dev/disk/floppy/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ floppy.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/disk/ide/makefile b/kernel/addons/dev/disk/ide/makefile index a40fe8c..564f635 100644 --- a/kernel/addons/dev/disk/ide/makefile +++ b/kernel/addons/dev/disk/ide/makefile @@ -7,7 +7,7 @@ MY_OBJS := \ ide.o \ ide_raw.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/disk/ide2/makefile b/kernel/addons/dev/disk/ide2/makefile index 300afa1..d60a3d2 100644 --- a/kernel/addons/dev/disk/ide2/makefile +++ b/kernel/addons/dev/disk/ide2/makefile @@ -13,7 +13,7 @@ MY_OBJS := \ isa_ide_bus.o \ pci_ide_bus.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/disk/ide3/makefile b/kernel/addons/dev/disk/ide3/makefile index a40fe8c..564f635 100644 --- a/kernel/addons/dev/disk/ide3/makefile +++ b/kernel/addons/dev/disk/ide3/makefile @@ -7,7 +7,7 @@ MY_OBJS := \ ide.o \ ide_raw.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/disk/netblock/makefile b/kernel/addons/dev/disk/netblock/makefile index 33a6df7..41b6114 100644 --- a/kernel/addons/dev/disk/netblock/makefile +++ b/kernel/addons/dev/disk/netblock/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ netblock.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/graphics/vesa/makefile b/kernel/addons/dev/graphics/vesa/makefile index 53276f4..eff4dd8 100644 --- a/kernel/addons/dev/graphics/vesa/makefile +++ b/kernel/addons/dev/graphics/vesa/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ vesa.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/input/pckeyboard/makefile b/kernel/addons/dev/input/pckeyboard/makefile index 8a3c652..3ac2a78 100644 --- a/kernel/addons/dev/input/pckeyboard/makefile +++ b/kernel/addons/dev/input/pckeyboard/makefile @@ -6,7 +6,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ keyboard.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/input/ps2mouse/makefile b/kernel/addons/dev/input/ps2mouse/makefile index 7ee9aac..88171d4 100644 --- a/kernel/addons/dev/input/ps2mouse/makefile +++ b/kernel/addons/dev/input/ps2mouse/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ ps2mouse.o \ -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/net/ns83820/makefile b/kernel/addons/dev/net/ns83820/makefile index a5b12ea..ec7d30f 100644 --- a/kernel/addons/dev/net/ns83820/makefile +++ b/kernel/addons/dev/net/ns83820/makefile @@ -8,7 +8,7 @@ MY_OBJS := \ ns83820.o \ ns83820_dev.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/net/pcnet32/makefile b/kernel/addons/dev/net/pcnet32/makefile index 64494b0..45056ad 100644 --- a/kernel/addons/dev/net/pcnet32/makefile +++ b/kernel/addons/dev/net/pcnet32/makefile @@ -8,7 +8,7 @@ MY_OBJS := \ pcnet32.o \ pcnet32_dev.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/net/rhine/makefile b/kernel/addons/dev/net/rhine/makefile index ea0a21b..e26fc59 100644 --- a/kernel/addons/dev/net/rhine/makefile +++ b/kernel/addons/dev/net/rhine/makefile @@ -8,7 +8,7 @@ MY_OBJS := \ rhine.o \ rhine_dev.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/net/rtl8139/makefile b/kernel/addons/dev/net/rtl8139/makefile index 74d729a..4b90913 100644 --- a/kernel/addons/dev/net/rtl8139/makefile +++ b/kernel/addons/dev/net/rtl8139/makefile @@ -8,7 +8,7 @@ MY_OBJS := \ rtl8139.o \ rtl8139_dev.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/net/rtl8169/makefile b/kernel/addons/dev/net/rtl8169/makefile index f98cb2d..eb9ed89 100644 --- a/kernel/addons/dev/net/rtl8169/makefile +++ b/kernel/addons/dev/net/rtl8169/makefile @@ -8,7 +8,7 @@ MY_OBJS := \ rtl8169.o \ rtl8169_dev.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/dev/tty/makefile b/kernel/addons/dev/tty/makefile index 30b66f1..8b3eef7 100644 --- a/kernel/addons/dev/tty/makefile +++ b/kernel/addons/dev/tty/makefile @@ -9,7 +9,7 @@ MY_OBJS += \ tty_master.o \ tty_slave.o -MY_INCLUDES := $(STDINCLUDES) +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/bus_managers/ide/makefile b/kernel/addons/modules/bus_managers/ide/makefile index da2c846..6f2c928 100644 --- a/kernel/addons/modules/bus_managers/ide/makefile +++ b/kernel/addons/modules/bus_managers/ide/makefile @@ -19,7 +19,7 @@ MY_OBJS := \ scsi2atapi.o \ sync.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/bus_managers/isa/makefile b/kernel/addons/modules/bus_managers/isa/makefile index fcdb80d..f6a990d 100644 --- a/kernel/addons/modules/bus_managers/isa/makefile +++ b/kernel/addons/modules/bus_managers/isa/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ isa.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/bus_managers/pci/makefile b/kernel/addons/modules/bus_managers/pci/makefile index 2e88503..aaebcf3 100644 --- a/kernel/addons/modules/bus_managers/pci/makefile +++ b/kernel/addons/modules/bus_managers/pci/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ pci.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/bus_managers/scsi/makefile b/kernel/addons/modules/bus_managers/scsi/makefile index 5f878b1..18bf9d0 100644 --- a/kernel/addons/modules/bus_managers/scsi/makefile +++ b/kernel/addons/modules/bus_managers/scsi/makefile @@ -20,7 +20,7 @@ MY_OBJS := \ xpt.o \ xpt_io.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/bus_managers/usb/makefile b/kernel/addons/modules/bus_managers/usb/makefile index 329851a..c7d5995 100644 --- a/kernel/addons/modules/bus_managers/usb/makefile +++ b/kernel/addons/modules/bus_managers/usb/makefile @@ -11,7 +11,7 @@ MY_OBJS := \ usb_hub.o \ usb_pipe.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/console/fb_console/makefile b/kernel/addons/modules/console/fb_console/makefile index ffd5916..2dd4c7a 100644 --- a/kernel/addons/modules/console/fb_console/makefile +++ b/kernel/addons/modules/console/fb_console/makefile @@ -6,7 +6,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ fb_console.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/console/vga_text/makefile b/kernel/addons/modules/console/vga_text/makefile index fa8bfa4..330a7c4 100644 --- a/kernel/addons/modules/console/vga_text/makefile +++ b/kernel/addons/modules/console/vga_text/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ console.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/console/vmware/makefile b/kernel/addons/modules/console/vmware/makefile index 5c4ea32..31d9d4c 100644 --- a/kernel/addons/modules/console/vmware/makefile +++ b/kernel/addons/modules/console/vmware/makefile @@ -7,7 +7,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ console.o -UDES := -I$(MY_SRCDIR) +MY_INCLUDES := $(STDINCLUDE) -I$(MY_SRCDIR) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/generic/blkman/makefile b/kernel/addons/modules/generic/blkman/makefile index 7b93ddf..f7e8020 100644 --- a/kernel/addons/modules/generic/blkman/makefile +++ b/kernel/addons/modules/generic/blkman/makefile @@ -6,7 +6,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ blkman.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/generic/locked_pool/makefile b/kernel/addons/modules/generic/locked_pool/makefile index 92461dc..156c52a 100644 --- a/kernel/addons/modules/generic/locked_pool/makefile +++ b/kernel/addons/modules/generic/locked_pool/makefile @@ -6,7 +6,7 @@ ifeq ($(call FINDINLIST,$(MY_TARGET),$(ALL)),1) MY_OBJS := \ locked_pool.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := diff --git a/kernel/addons/modules/generic/scsi_periph/makefile b/kernel/addons/modules/generic/scsi_periph/makefile index 360baa6..e36c8d2 100644 --- a/kernel/addons/modules/generic/scsi_periph/makefile +++ b/kernel/addons/modules/generic/scsi_periph/makefile @@ -12,7 +12,7 @@ MY_OBJS := \ removable.o \ scsi_periph.o -MY_INCLUDES := -Iinclude +MY_INCLUDES := $(STDINCLUDE) MY_CFLAGS := $(KERNEL_CFLAGS) MY_LIBS := $(LIBKERNEL) MY_LIBPATHS := -- 2.11.4.GIT