diff options
| -rw-r--r-- | config.mk | 5 | ||||
| -rw-r--r-- | obj/hbicore/.gitignore | 0 | ||||
| -rw-r--r-- | obj/modules/.gitignore | 0 | ||||
| -rw-r--r-- | obj/modules/example/.gitignore | 0 | ||||
| -rw-r--r-- | src/build/.gitignore (renamed from src/bld/.gitignore) | 0 | ||||
| -rw-r--r-- | src/build/linker.C (renamed from src/bld/linker.C) | 0 | ||||
| -rw-r--r-- | src/build/makefile (renamed from src/bld/makefile) | 0 | ||||
| -rw-r--r-- | src/makefile | 2 |
8 files changed, 5 insertions, 2 deletions
@@ -13,12 +13,15 @@ LDMAPFLAGS = -Map $@.map INCDIR = ${ROOTPATH}/src/include/ ${OBJDIR}/%.o : %.C + mkdir -p ${OBJDIR} ${CXX} -c ${CXXFLAGS} $< -o $@ -I ${INCDIR} ${OBJDIR}/%.o : %.c + mkdir -p ${OBJDIR} ${CC} -c ${CFLAGS} $< -o $@ -I ${INCDIR} ${OBJDIR}/%.o : %.S + mkdir -p ${OBJDIR} ${CC} -c ${ASMFLAGS} $< -o $@ -Wa,-I${INCDIR} ${IMGDIR}/%.so : ${OBJECTS} ${ROOTPATH}/src/module.ld @@ -30,7 +33,7 @@ ${IMGDIR}/%.elf: kernel.ld ${OBJDIR}/*.o ${ROOTPATH}/src/kernel.ld -T ${ROOTPATH}/src/kernel.ld -o $@ ${IMGDIR}/%.bin: ${IMGDIR}/%.elf $(wildcard ${IMGDIR}/*.so) - ${ROOTPATH}/src/bld/linker $@ $^ + ${ROOTPATH}/src/build/linker $@ $^ %.d: cd ${basename $@} && ${MAKE} diff --git a/obj/hbicore/.gitignore b/obj/hbicore/.gitignore deleted file mode 100644 index e69de29bb..000000000 --- a/obj/hbicore/.gitignore +++ /dev/null diff --git a/obj/modules/.gitignore b/obj/modules/.gitignore deleted file mode 100644 index e69de29bb..000000000 --- a/obj/modules/.gitignore +++ /dev/null diff --git a/obj/modules/example/.gitignore b/obj/modules/example/.gitignore deleted file mode 100644 index e69de29bb..000000000 --- a/obj/modules/example/.gitignore +++ /dev/null diff --git a/src/bld/.gitignore b/src/build/.gitignore index 6b243f5f3..6b243f5f3 100644 --- a/src/bld/.gitignore +++ b/src/build/.gitignore diff --git a/src/bld/linker.C b/src/build/linker.C index fda2059d4..fda2059d4 100644 --- a/src/bld/linker.C +++ b/src/build/linker.C diff --git a/src/bld/makefile b/src/build/makefile index d80e2b533..d80e2b533 100644 --- a/src/bld/makefile +++ b/src/build/makefile diff --git a/src/makefile b/src/makefile index 9a95f0702..2fd17b6fe 100644 --- a/src/makefile +++ b/src/makefile @@ -2,7 +2,7 @@ ROOTPATH = .. IMGDIR = ${ROOTPATH}/img OBJDIR = ${ROOTPATH}/obj/hbicore -SUBDIRS = kernel.d lib.d libc++.d sys.d usr.d bld.d +SUBDIRS = kernel.d lib.d libc++.d sys.d usr.d build.d IMAGES += ${IMGDIR}/hbicore.elf IMAGES += ${IMGDIR}/hbicore.bin |
