summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-10-22 21:40:08 +0200
committerMichal Idziorek <m.i@gmx.at>2014-10-22 21:40:08 +0200
commit97750badf74389b8c8a80d5eab7fa913c1ae0235 (patch)
tree2fc2ab640dc39d4d01a471ff5035f39214c6c7f5
parent5410f2dca7b1f9198ed83b276d3f69a7a171f17e (diff)
fixes in Makefile, concerning release and clean
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2eb2077..3e67244 100644
--- a/Makefile
+++ b/Makefile
@@ -123,13 +123,16 @@ run: all
############ cleanup ############
-clean:
- -rm *.bin *.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2)
+clean_release:
+ -rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2)
make -C userspace clean
+clean: clean_release
+ -rm FoolOs.img
-release: all
- -rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2)
+release: new
+ -mv FoolOS.img release/
+ make clean_release
userspace/ext2.img:
make -C userspace