summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile34
1 files changed, 21 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 4c60bad..c6a04c8 100644
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,12 @@ CFLAGS+=-gstabs
#CFLAGS+=-fno-zero-initialized-in-bss
#CFLAGS+=-fdata-sections -ffunction-sections
-#CFLAGS+= -w # disable all warnings
+CFLAGS+= -w # disable all warnings
#CFLAGS+= -Wimplicit-function-declaration
#CFLAGS+= -Wextra
-CFLAGS+= -Wall
+#CFLAGS+= -Wall
#CFLAGS+= -Werror
-#CFLAGS+= -Werror=implicit-function-declaration
+CFLAGS+= -Werror=implicit-function-declaration
######## linker flags ####################
LDFLAGS=
@@ -45,8 +45,9 @@ ASFLAGS=
ASFLAGS+=-gstabs
########## verbosity ##################3
-#V = 0
-#CC = @echo "Compiling $<..."; i686-foolos-gcc
+V = 0
+CC = @echo "Compiling (i686-elf-gcc) $<..."; i686-elf-gcc
+AS = @echo "Assembling (i686-elf-as) $<..."; i686-elf-as
#CC_1 = $(CCC)
#CC = $(CC_$(V))
@@ -108,10 +109,12 @@ CLEANDIRS=$(SUBDIRS:%=clean-%)
.PHONY: $(SUBDIRS) $(CLEANDIRS)
$(SUBDIRS):
- $(MAKE) -C $@
+ @echo "-- Recursing make to [$@]..."; $(MAKE) --no-print-directory -C $@
+ @echo "-- Returned from [$@]"
$(CLEANDIRS):
- $(MAKE) -C $(@:clean-%=%) clean
+ @echo "-- Recursing clean to [$(@:clean-%=%)]..."; $(MAKE) --no-print-directory -C $(@:clean-%=%) clean
+ @echo "-- Returned from [$(@:clean-%=%)]"
############ linking kernel binary ############
@@ -164,11 +167,11 @@ stop-qemu:
############ cleanup ############
clean: $(CLEANDIRS)
- -rm *.bin $(FOOLOS) $(FOOLOS_ISO) $(FOOLOS_VDI) $(KERNEL_ENTRY) $(ASM_MULTIBOOT_OBJ) $(KERNEL_IMG) $(ASM_OBJECTS) $(OBJECTS) $(IMG_FILLUP) $(BIN_MBR) $(BIN_MP) $(BIN_STAGE2) $(DEPS) bochs.out bochs.log ne2k-tx.log ne2k-txdump.txt tags mp/mp.bin grubiso/boot/foolos.bin grubiso/boot/ext2.img
- -rm ./doc/ -r
+ @echo "Cleaning..."; rm -f *.bin $(FOOLOS) $(FOOLOS_ISO) $(FOOLOS_VDI) $(KERNEL_ENTRY) $(ASM_MULTIBOOT_OBJ) $(KERNEL_IMG) $(ASM_OBJECTS) $(OBJECTS) $(IMG_FILLUP) $(BIN_MBR) $(BIN_MP) $(BIN_STAGE2) $(DEPS) bochs.out bochs.log ne2k-tx.log ne2k-txdump.txt tags mp/mp.bin grubiso/boot/foolos.bin grubiso/boot/ext2.img
+ @echo "Cleaning Documentation..."; rm -f ./doc/ -r
tags:
- ctags --recurse=yes .
+ @echo "Generating ctags..." ctags --recurse=yes .
############ mounting #############
@@ -185,9 +188,14 @@ tags:
##### ISO #####
$(FOOLOS_ISO): $(KERNEL_IMG) userspace
- cp $(KERNEL_IMG) grubiso/boot/foolos.bin
- cp $(IMG_USERSPACE) grubiso/boot
- grub-mkrescue -o $(FOOLOS_ISO) grubiso/
+ @echo "------------------------"
+ @echo "Create ISO..."
+ @cp $(KERNEL_IMG) grubiso/boot/foolos.bin
+ @cp $(IMG_USERSPACE) grubiso/boot
+ @grub-mkrescue -o $(FOOLOS_ISO) grubiso/
+ @echo "Finished ISO"
+ @echo "------------------------"
+
#### README ###
gitweb_readme: