diff --git a/src/sys/Makefile b/src/sys/Makefile index 5fb3fba..23e7f4e 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -2,10 +2,7 @@ # Kernel Makefile (C) 2002 The UbixOS Project include ../Makefile.incl - -#all: kernel-code vmm-code init-code kmods-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 +include Makefile.incl all: @echo @@ -21,17 +18,19 @@ @echo "***************************************************************" @echo "Step 2: Build Kernel Objects" @echo "***************************************************************" - ${KMAKE} kernel + ${KMAKE} kernel-build @echo @echo "***************************************************************" @echo "Step 3: Link Kernel Objects" @echo "***************************************************************" - ${KMAKE} kernel + ${KMAKE} kernel-build @echo @echo "***************************************************************" @echo "Kernel Build For ${_ARCH} Completed On `LC_ALL=C date`" @echo "***************************************************************" +kernel-build: init-code sys-code arch-code kernel-code vmm-code mpi-code fs-code lib-code isa-code pci-code kernel-img + generic-code: generic (cd generic;make) @@ -42,7 +41,6 @@ (cd ${_ARCH};make) kernel-code: kernel - (echo ${_ARCH}) (cd kernel;make) isa-code: isa @@ -94,6 +92,22 @@ # (cd ../tools/;make format-dsk) (cd ../tools/;make install-ubix) +install-kernel: + @echo + @echo "***************************************************************" + @echo "Kernel Install For ${_ARCH} Started On `LC_ALL=C date`" + @echo "***************************************************************" + @echo + @echo "***************************************************************" + @echo "Step 1: Copy Kernel" + @echo "***************************************************************" + cp sys/compile/kernel ${ROOT}/boot/kernel/ + sync + @echo + @echo "***************************************************************" + @echo "Kernel Install For ${_ARCH} Completed On `LC_ALL=C date`" + @echo "***************************************************************" + clean: (cd init;make clean) (cd ${_ARCH};make clean) diff --git a/src/sys/Makefile.incl b/src/sys/Makefile.incl index b1502b4..9d90ab9 100644 --- a/src/sys/Makefile.incl +++ b/src/sys/Makefile.incl @@ -1,7 +1,7 @@ #tmp include ../Makefile.incl -KERNEL_SRC=${CURDIR} +KERNEL_SRC=${.CURDIR} KERNEL_OBJ=${OBJ_DIR}${KERNEL_SRC} KERNEL_CONF=${KERNEL_SRC}/${_ARCH}/conf KERNEL_NAME=kernel @@ -11,4 +11,4 @@ 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 \ No newline at end of file +CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O