Moved shell files into Makefile

4 files changed, 75 insertions, 98 deletions

diff --git a/Makefile b/Makefile
index 2010495..a6fc13b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,72 @@
-all:
-	sh cross.sh
-	sh build.sh
\ No newline at end of file
+DIR := $(shell pwd)/cross
+export PREFIX := $(DIR)/opt
+export TARGET := i686-elf
+export PATH := $(PREFIX)/bin:$(PATH)
+
+clean:
+	@-rm -rf build
+	@echo Cleaned build directory
+
+build:
+	set -e; \
+	rm -rf ./build/ ./iso/; \
+	mkdir ./build/; \
+
+	# Assemble ASM files
+	nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o || exit; \
+
+    # Make all C files
+	find ./src/kernel/ -name \*.c >./build/tmp; \
+	while read -r line; do \
+		stripped=$$(echo "$${line}" | sed -r 's/\//_/g'); \
+		stripped=$${stripped#??????}; \
+		stripped=$${stripped%%?}o; \
+		i686-elf-gcc -c ./"$${line}" -o ./build/"$${stripped}" -std=gnu99 -ffreestanding -O2 -Wall -Wextra || exit; \
+	done <./build/tmp; \
+	rm ./build/tmp; \
+
+	i686-elf-gcc -T ./src/kernel/linker.ld -o ./build/melvix.bin -ffreestanding -O2 -nostdlib ./build/*.o -lgcc || exit; \
+
+	# Testing
+	if grub-file --is-x86-multiboot ./build/melvix.bin; then \
+		echo Multiboot confirmed; \
+	else \
+		echo Melvix has errors and won\'t be able to multi boot!; \
+		exit; \
+	fi; \
+
+	# Create ISO
+	mkdir -p ./iso/boot/grub; \
+	cp ./build/melvix.bin ./iso/boot/; \
+	cp ./src/kernel/grub.cfg ./iso/boot/grub/; \
+	grub-mkrescue -o ./build/melvix.iso ./iso/;
+
+cross:
+	set -e; \
+	mkdir cross || exit; \
+	cd cross || exit; \
+	DIR=$$(pwd); \
+	mkdir "$${DIR}/src" && cd "$${DIR}/src" || exit; \
+	echo "Downloading..."; \
+	curl -sSL "https://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz" | tar xJ; \
+	curl -sSL "https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz" | tar xJ; \
+	mkdir -p "$${DIR}/opt/bin"; \
+	export PREFIX="$${DIR}/opt"; \
+	export TARGET=i686-elf; \
+	export PATH="$$PREFIX/bin:$$PATH"; \
+	mkdir "$${DIR}/src/build-binutils" && cd "$${DIR}/src/build-binutils" || exit; \
+	../binutils-2.32/configure --target="$$TARGET" --prefix="$$PREFIX" --with-sysroot --disable-nls --disable-werror; \
+	make; \
+	make install; \
+	mkdir "$${DIR}/src/build-gcc" && cd "$${DIR}/src/build-gcc" || exit; \
+	../gcc-9.2.0/configure --target="$$TARGET" --prefix="$$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers; \
+	make all-gcc; \
+	make all-target-libgcc; \
+	make install-gcc; \
+	make install-target-libgcc; \
+	cd "$${DIR}/.." || exit;
+
+test: build
+	qemu-system-x86_64 -soundhw pcspk -enable-kvm -cdrom ./build/melvix.iso
+
+.PHONY: build clean cross test
\ No newline at end of file
diff --git a/README.md b/README.md
index 820746a..bdc7baa 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@
     * nasm
     * grub
     * qemu
-* Run `make` 
-* Test Melvix in QEMU (should open automatically after successful `make`)
+* Build a cross compiler using `make cross`
+* Run `make build` 
+* Test Melvix in QEMU (opens after `make test`)
 * Optional: Flash the built ISO to a USB/Floppy/CD drive using `sudo dd if=./build/melvix.iso of=/dev/sdX bs=4M oflag=sync`
diff --git a/build.sh b/build.sh
deleted file mode 100755
index f09a705..0000000
--- a/build.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env sh
-# Builds the operating system image
-
-# Install and source cross compiler if not already installed
-. ./cross.sh
-
-# Create build directories
-rm -rf ./build/ ./iso/
-mkdir ./build/
-
-# Assemble ASM files
-nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o || exit
-
-# Make all C files
-files=""
-find ./src/kernel/ -name \*.c >./build/tmp
-while read -r line; do
-  stripped=$(echo "${line}" | sed -r 's/\//_/g')
-  stripped=${stripped#??????}
-  stripped=${stripped%%?}o
-  i686-elf-gcc -c ./"${line}" -o ./build/"${stripped}" -std=gnu99 -ffreestanding -O2 -Wall -Wextra || exit
-  files="${files} ./build/${stripped}"
-done <./build/tmp
-rm ./build/tmp
-
-# shellcheck disable=SC2086
-# Shellcheck suppression is needed because gcc would think that $files is one file
-i686-elf-gcc -T ./src/kernel/linker.ld -o ./build/melvix.bin -ffreestanding -O2 -nostdlib ./build/boot.o $files -lgcc || exit
-
-# Testing
-if grub-file --is-x86-multiboot ./build/melvix.bin; then
-  echo Multiboot confirmed
-else
-  echo Melvix has errors and won\'t be able to multi boot!
-  exit
-fi
-
-# Create ISO
-mkdir -p ./iso/boot/grub
-cp ./build/melvix.bin ./iso/boot/
-cp ./src/kernel/grub.cfg ./iso/boot/grub/
-grub-mkrescue -o ./build/melvix.iso ./iso/
-
-# Run ISO
-qemu-system-x86_64 -soundhw pcspk -enable-kvm -cdrom ./build/melvix.iso
diff --git a/cross.sh b/cross.sh
deleted file mode 100755
index eb6f21d..0000000
--- a/cross.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env sh
-# Sets up a cross compiler
-# TODO: Rewrite everything for 64-Bit
-
-if [ ! -d "./cross/" ]; then
-  # Create directory
-  mkdir -p cross
-  cd cross || exit
-  DIR=$(pwd)
-
-  # Get sources
-  mkdir "${DIR}/src" && cd "${DIR}/src" || exit
-  echo "Downloading..."
-  curl -sSL "https://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz" | tar xJ
-  curl -sSL "https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz" | tar xJ
-
-  # Prepare compiling
-  mkdir -p "${DIR}/opt/bin"
-  export PREFIX="${DIR}/opt"
-  export TARGET=i686-elf
-  export PATH="$PREFIX/bin:$PATH"
-
-  # Compile binutilsq
-  mkdir "${DIR}/src/build-binutils" && cd "${DIR}/src/build-binutils" || exit
-  ../binutils-2.32/configure --target="$TARGET" --prefix="$PREFIX" --with-sysroot --disable-nls --disable-werror
-  make
-  make install
-
-  # Compile GCC
-  mkdir "${DIR}/src/build-gcc" && cd "${DIR}/src/build-gcc" || exit
-  ../gcc-9.2.0/configure --target="$TARGET" --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
-  make all-gcc
-  make all-target-libgcc
-  make install-gcc
-  make install-target-libgcc
-
-  # Source exported variables
-  cd "${DIR}/.." || exit
-  . cross.sh
-else
-  # Should be sourced to take effect
-  cd cross || exit
-  DIR=$(pwd)
-  export PREFIX="${DIR}/opt"
-  export TARGET=i686-elf
-  export PATH="$PREFIX/bin:$PATH"
-  cd ..
-fi