From 41f58e47ada48204d4b4dea4b0f98f16748d73a0 Mon Sep 17 00:00:00 2001 From: Li Jinpei Date: Sun, 25 Jul 2021 01:50:25 +0800 Subject: [PATCH] add .gitignore and ignore clean fail --- .gitignore | 8 ++++++++ Makefile | 10 +++++----- fs/Makefile | 2 +- kernel/Makefile | 6 +++--- kernel/blk_drv/Makefile | 4 ++-- kernel/chr_drv/Makefile | 4 ++-- lib/Makefile | 4 ++-- mm/Makefile | 2 +- 8 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ec68787 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*.a +*.o +/bootsect +/kernel/system +/kernel/System.map +/linux.img +/setup +/tools/build diff --git a/Makefile b/Makefile index 1b3b33e..cefc423 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ setup : setup.o setup.o : setup.S $(AS) -o $@ $< clean: - rm *.o - rm bootsect - rm setup - rm tools/build - rm linux.img + -rm *.o + -rm bootsect + -rm setup + -rm tools/build + -rm linux.img cd kernel; make clean; cd .. diff --git a/fs/Makefile b/fs/Makefile index 193ad9f..7dfe35f 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -42,5 +42,5 @@ truncate.o : truncate.c $(GCC) $(CCFLAG) -o $@ $< clean : - rm *.o + -rm *.o diff --git a/kernel/Makefile b/kernel/Makefile index 8c976ab..92f6961 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -57,12 +57,12 @@ blk_drv/blk_drv.a: blk_drv/*.c cd ../fs; make fs.o; cd ../kernel clean : - rm *.o + -rm *.o cd chr_drv; make clean; cd .. cd blk_drv; make clean; cd .. cd ../mm; make clean; cd ../kernel cd ../lib; make clean; cd ../kernel cd ../fs; make clean; cd ../kernel - rm system - rm System.map + -rm system + -rm System.map diff --git a/kernel/blk_drv/Makefile b/kernel/blk_drv/Makefile index 3e0b2a9..09d793e 100644 --- a/kernel/blk_drv/Makefile +++ b/kernel/blk_drv/Makefile @@ -18,6 +18,6 @@ floppy.o : floppy.c $(GCC) $(CCFLAG) -o $@ $< clean : - rm *.o - rm blk_drv.a + -rm *.o + -rm blk_drv.a diff --git a/kernel/chr_drv/Makefile b/kernel/chr_drv/Makefile index 42c9ec9..7fbf851 100644 --- a/kernel/chr_drv/Makefile +++ b/kernel/chr_drv/Makefile @@ -21,6 +21,6 @@ console.o : console.c $(GCC) $(CCFLAG) -o $@ $< clean : - rm *.o - rm chr_drv.a + -rm *.o + -rm chr_drv.a diff --git a/lib/Makefile b/lib/Makefile index 60cd88d..8505f39 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -24,6 +24,6 @@ dup.o : dup.c $(GCC) $(CCFLAG) -o $@ $< clean : - rm *.o - rm lib.a + -rm *.o + -rm lib.a diff --git a/mm/Makefile b/mm/Makefile index e334d0b..19da3c7 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -18,5 +18,5 @@ page.o : page.S $(GCC) -m32 -traditional -c -o $@ $< clean : - rm *.o + -rm *.o -- Gitee