diff --git a/.cproject b/.cproject index 22acb13..bb8f40f 100644 --- a/.cproject +++ b/.cproject @@ -18,7 +18,7 @@ - + diff --git a/src/Makefile b/src/Makefile index 5172b5b..86a2b67 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,6 @@ # $Id: Makefile 148 2016-01-18 19:34:32Z reddawg $ # The System Makefile (C) 2002 The UbixOS Project -_ARCH?=${MACHINE_ARCH} - -_ARCH=i386 - MAKE=make CURDIR=${.CURDIR} @@ -13,7 +9,6 @@ CLEANDIR=clean - KMAKE= ${MAKE} ${KERNEL_FLAGS} INCLUDE=${KERNEL_INC} KERNEL=${KERNEL_NAME} WORLD_LIB_SRC=${CURDIR}/lib diff --git a/src/Makefile.incl b/src/Makefile.incl index 5b03fc0..30939ec 100644 --- a/src/Makefile.incl +++ b/src/Makefile.incl @@ -9,8 +9,11 @@ #LD = ld #AR = ar - #Glogal Override And Defs +_ARCH?=${MACHINE_ARCH} + +_ARCH=i386 + REMOVE = rm -rf FD_DEVICE = /dev/md0 diff --git a/src/sys/Makefile b/src/sys/Makefile index 91a0e56..5d35cf0 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -5,7 +5,32 @@ #all: kernel-code vmm-code init-code kmods-code kernel-img -all: init-code sys-code arch-code kernel-code vmm-code mpi-code fs-code lib-code isa-code pci-code kernel-img +kernel: init-code sys-code arch-code kernel-code vmm-code mpi-code fs-code lib-code isa-code pci-code kernel-img + +all: + @echo + @echo "***************************************************************" + @echo "Kernel Build For ${_ARCH} Started On `LC_ALL=C date`" + @echo "***************************************************************" + @echo + @echo "***************************************************************" + @echo "Step 1: Clean Kernel" + @echo "***************************************************************" + ${MAKE} clean + @echo + @echo "***************************************************************" + @echo "Step 2: Build Kernel Objects" + @echo "***************************************************************" + ${MAKE} all + @echo + @echo "***************************************************************" + @echo "Step 3: Link Kernel Objects" + @echo "***************************************************************" + ${MAKE} all + @echo + @echo "***************************************************************" + @echo "Kernel Build For ${_ARCH} Completed On `LC_ALL=C date`" + @echo "***************************************************************" generic-code: generic (cd generic;make) diff --git a/src/sys/Makefile.incl b/src/sys/Makefile.incl index 931b452..b1502b4 100644 --- a/src/sys/Makefile.incl +++ b/src/sys/Makefile.incl @@ -1,4 +1,5 @@ -# $Id: Makefile.inc 113 2016-01-14 00:40:12Z reddawg $ +#tmp +include ../Makefile.incl KERNEL_SRC=${CURDIR} KERNEL_OBJ=${OBJ_DIR}${KERNEL_SRC} @@ -7,8 +8,7 @@ KERNEL_FLAGS=_ARCH=${_ARCH} CC="cc" CXX="c++" AS="as" AR="ar" LD="ld" NM=nm OBJDUMP= OBJCOPY="objcopy" RANLIB=ranlib KERNEL_INC=${KERNEL_SRC}/include - KMAKE= ${MAKE} ${KERNEL_FLAGS} INCLUDE=${KERNEL_INC} KERNEL=${KERNEL_NAME} INCLUDES = -I${INCLUDE} -CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O +CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O \ No newline at end of file diff --git a/src/sys/init/Makefile b/src/sys/init/Makefile index 91a2c4a..96d818c 100644 --- a/src/sys/init/Makefile +++ b/src/sys/init/Makefile @@ -2,7 +2,6 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.incl include ../Makefile.incl # Objects