have an app makefile

Makefile

@@ -1,25 +1,5 @@
-.DEFAULT_GOAL = image
-
-ifneq ($(MAKECMDGOALS), clean)
-ifeq ($(ARCH), )
-$(error "Usage: make [play|clean] ARCH=[native|mips32-npc|x86-qemu] APP=[hello|video|...]")
-endif
-endif
-
-# -----------------------------------------------------------------------------
-
-ifeq ($(ARCH), mips32-npc)
-CROSS_COMPILE = mips-linux-gnu-
-endif
-# TODO: refactor
-ifeq ($(ARCH), mips32-minimal)
-CROSS_COMPILE = mips-linux-gnu-
-endif
-
-AS = $(CROSS_COMPILE)gcc
-CC = $(CROSS_COMPILE)gcc
-CXX = $(CROSS_COMPILE)g++
-LD = $(CROSS_COMPILE)ld
+.DEFAULT_GOAL = library
+AM_HOME ?= $(shell pwd)
 
 $(shell mkdir -p build/$(ARCH))
 
@@ -36,46 +16,10 @@ AM_SRC  = $(call findsrc, $(AM_PATH)/src)
 AM_OBJ  = $(call objdest, $(AM_SRC))
 AM_DEP  = $(call depdest, $(AM_SRC))
 
-# Application archive
-APP_PATH = ./apps/$(APP)
-APP_LIB  = ./build/$(ARCH)/$(APP).a
-APP_SRC  = $(call findsrc, $(APP_PATH)/src)
-APP_OBJ  = $(call objdest, $(APP_SRC))
-APP_DEP  = $(call depdest, $(APP_SRC))
-
-# Klib archive
-KLIB     = ./build/$(ARCH)/libkern.a
-KLIB_SRC = $(call findsrc, ./klib/)
-KLIB_OBJ = $(call objdest, $(KLIB_SRC))
-KLIB_DEP = $(call depdest, $(KLIB_SRC))
+include Makefile.compile
 
 # -----------------------------------------------------------------------------
 
-# Basic compilation flags
-CFLAGS   += -std=gnu99 -I./am/ -I./$(AM_PATH)/include -I./klib -I./$(APP_PATH)/include -O2 -MD -Wall -Werror -ggdb
-CXXFLAGS += -std=c++11 -I./am/ -I./$(AM_PATH)/include -I./klib -I./$(APP_PATH)/include -O2 -MD -Wall -Werror -ggdb
-ASFLAGS  +=            -I./am/ -I./$(AM_PATH)/include -I./$(APP_PATH)/include -MD
-
-# Arch-dependent compilation flags
-ifeq ($(ARCH), mips32-npc)
-CXX = $(CROSS_COMPILE)g++-5
-CFLAGS   += -MD -fno-pic -static -fno-strict-aliasing -fno-builtin -fno-stack-protector -fno-delayed-branch -mno-abicalls -march=mips32 -mno-check-zero-division -EL
-CXXFLAGS += -fno-pic -static -fno-strict-aliasing -fno-builtin -fno-stack-protector -fno-delayed-branch -mno-abicalls -march=mips32 -ffreestanding -fno-rtti -fno-exceptions -mno-check-zero-division -EL
-ASFLAGS  += -march=mips32 -EL -MD -mno-check-zero-division -O0 -mno-abicalls -fno-pic -fno-delayed-branch
-endif
-ifeq ($(ARCH), mips32-minimal)
-CXX = $(CROSS_COMPILE)g++-5
-CFLAGS   += -MD -fno-pic -static -fno-strict-aliasing -fno-builtin -fno-stack-protector -fno-delayed-branch -mno-abicalls -march=mips32 -mno-check-zero-division -EL
-CXXFLAGS += -fno-pic -static -fno-strict-aliasing -fno-builtin -fno-stack-protector -fno-delayed-branch -mno-abicalls -march=mips32 -ffreestanding -fno-rtti -fno-exceptions -mno-check-zero-division -EL
-ASFLAGS  += -march=mips32 -EL -MD -mno-check-zero-division -O0 -mno-abicalls -fno-pic -fno-delayed-branch
-endif
-
-ifeq ($(ARCH), x86-qemu)
-CFLAGS   += -m32 -fno-builtin -fno-stack-protector -fno-omit-frame-pointer
-CXXFLAGS += -m32 -fno-builtin -fno-stack-protector -fno-omit-frame-pointer -ffreestanding -fno-rtti -fno-exceptions
-ASFLAGS  += -m32
-endif
-
 # Compilation patterns
 build/$(ARCH)/%.o: %.cpp
 	@mkdir -p $(dir $@)
@@ -91,56 +35,14 @@ build/$(ARCH)/%.o: %.S
 
 # -----------------------------------------------------------------------------
 
-# The final binary
-DEST = build/$(APP)-$(ARCH)
-
-.PHONY: image
-image: $(AM_LIB) $(KLIB) $(APP_LIB)
-	$(AM_PATH)/img/build $(DEST) $(shell readlink -f $(AM_LIB)) $(shell readlink -f $(KLIB)) $(shell readlink -f $(APP_LIB))
-
-# AM library
-$(AM_LIB): $(AM_OBJ)
+.PHONY: library
+library: $(AM_OBJ)
 	ar rcs $(AM_LIB) $(AM_OBJ)
 -include $(AM_DEP)
 
-# Kernel library
-$(KLIB): $(KLIB_OBJ)
-	ar rcs $(KLIB) $(KLIB_OBJ)
--include $(KLIB_DEP)
-
-# Application
-$(APP_LIB): $(APP_OBJ)
-	ar rcs $(APP_LIB) $(APP_OBJ)
--include $(APP_DEP)
-
 # -----------------------------------------------------------------------------
 
 .PHONY: play clean
-
-play: $(AM_LIB) image
-ifeq ($(ARCH), mips32-npc)
-	@echo "Burn it to FPGA."
-endif
-ifeq ($(ARCH), mips32-minimal)
-	@echo "Burn it to FPGA."
-endif
-ifeq ($(ARCH), native)
-	@$(DEST)
-endif
-ifeq ($(ARCH), x86-qemu)
-	@qemu-system-i386 -serial stdio $(DEST)
-endif
-
-debug: $(AM_LIB) $(DEST)
-ifeq ($(ARCH), mips32-npc)
-	@echo "Debugging"
-endif
-ifeq ($(ARCH), native)
-	@gdb $(DEST)
-endif
-ifeq ($(ARCH), x86-qemu)
-	@qemu-system-i386 -serial stdio -s -S $(DEST)
-endif
 clean:
 	rm -rf build/ $(shell find . -name "*.o" -o -name "*.d")
 

Makefile.app

@@ -5,6 +5,12 @@ DST_DIR ?= $(APP_DIR)/build/
 
 $(shell mkdir -p $(DST_DIR))
 
+objdest = $(addprefix build/$(ARCH)/, $(addsuffix .o, $(basename $(1))))
+depdest = $(addprefix build/$(ARCH)/, $(addsuffix .o, $(basename $(1))))
+
+OBJS = $(objdest $(SRCS))
+DEPS = $(objdest $(DEPS))
+
 include ${AM_HOME}/Makefile.compile
 
 # Compilation patterns
@@ -20,6 +26,10 @@ $(DST_DIR)/$(ARCH)/%.o: %.S
 	@mkdir -p $(dir $@)
 	$(AS) $(ASFLAGS) -c -o $@ $<
 
-.PHONY: image
+.PHONY: image clean
 image: $(OBJS)
 	@echo "Hello"
+
+clean:
+	rm -rf $(APP_DIR)/build/
+

apps/cputest/Makefile.max

@@ -1,4 +1,4 @@
-OBJS += max.o
+SRCS += max.c
 AM_HOME = /home/jyy/Projects/nexus-am/
 
 all:

klib/Makefile

@@ -0,0 +1,3 @@
+SRCS += printk.c string.c
+AM_HOME = /home/jyy/Projects/nexus-am/
+include ${AM_HOME}/Makefile.app

klib/printk.c

@@ -1,4 +1,4 @@
-#include<klib.h>
+#include"klib.h"
 #include<stdarg.h>
 
 void printch(char ch);

klib/string.c

@@ -1,4 +1,4 @@
-#include <klib.h>
+#include "klib.h"
 
 size_t strlen(const char *s) {
   size_t sz = 0;