Review makefiles

Makefile

@@ -14,35 +14,14 @@ bootloader/stage1.bin: force_look
 bootloader/stage2.bin: force_look
 	cd bootloader; $(MAKE) stage2.bin
 
-programs/one/a.out: force_look tlib/libtlib.a
+programs: force_look tlib/libtlib.a
-	cd programs/one; ${MAKE} a.out
+	cd programs/; ${MAKE} dist
-
-programs/hello/a.out: force_look tlib/libtlib.a
-	cd programs/hello; ${MAKE} a.out
-
-programs/long/a.out: force_look tlib/libtlib.a
-	cd programs/long; ${MAKE} a.out
-
-programs/longone/a.out: force_look tlib/libtlib.a
-	cd programs/longone; ${MAKE} a.out
-
-programs/longtwo/a.out: force_look tlib/libtlib.a
-	cd programs/longtwo; ${MAKE} a.out
-
-programs/loop/a.out: force_look tlib/libtlib.a
-	cd programs/loop; ${MAKE} a.out
-
-programs/keyboard/a.out: force_look tlib/libtlib.a
-	cd programs/keyboard; ${MAKE} a.out
-
-programs/tsh/tsh: force_look tlib/libtlib.a
-	cd programs/tsh; ${MAKE} tsh
 
 hdd.img:
 	dd if=/dev/zero of=hdd.img bs=516096c count=1000
 	(echo n; echo p; echo 1; echo ""; echo ""; echo t; echo c; echo a; echo 1; echo w;) | sudo fdisk -u -C1000 -S63 -H16 hdd.img
 
-thor.flp: hdd.img bootloader/stage1.bin bootloader/stage2.bin kernel/kernel.bin programs/one/a.out programs/hello/a.out programs/long/a.out programs/loop/a.out programs/longone/a.out programs/longtwo/a.out programs/keyboard/a.out programs/tsh/tsh
+thor.flp: hdd.img bootloader/stage1.bin bootloader/stage2.bin kernel/kernel.bin programs
 	mkdir -p mnt/fake/
 	dd if=bootloader/stage1.bin of=hdd.img conv=notrunc
 	dd if=bootloader/stage2.bin of=hdd.img seek=1 conv=notrunc
@@ -50,14 +29,7 @@ thor.flp: hdd.img bootloader/stage1.bin bootloader/stage2.bin kernel/kernel.bin
 	sudo /usr/sbin/mkdosfs -F32 /dev/loop0
 	sudo /bin/mount -t vfat /dev/loop0 mnt/fake/
 	sudo /bin/cp kernel/kernel.bin mnt/fake/
-	sudo /bin/cp programs/one/a.out mnt/fake/one
+	sudo /bin/cp programs/dist/* mnt/fake/
-	sudo /bin/cp programs/hello/a.out mnt/fake/hello
-	sudo /bin/cp programs/long/a.out mnt/fake/long
-	sudo /bin/cp programs/longone/a.out mnt/fake/longone
-	sudo /bin/cp programs/longtwo/a.out mnt/fake/longtwo
-	sudo /bin/cp programs/loop/a.out mnt/fake/loop
-	sudo /bin/cp programs/keyboard/a.out mnt/fake/keyboard
-	sudo /bin/cp programs/tsh/tsh mnt/fake/tsh
 	sleep 0.1
 	sudo /bin/umount mnt/fake/
 	sudo /sbin/losetup -d /dev/loop0
@@ -84,14 +56,7 @@ force_look:
 clean:
 	cd bootloader; $(MAKE) clean
 	cd kernel; $(MAKE) clean
-	cd programs/one; $(MAKE) clean
+	cd programs/; $(MAKE) clean
-	cd programs/hello; $(MAKE) clean
-	cd programs/long;$(MAKE) clean
-	cd programs/loop; $(MAKE) clean
-	cd programs/longone; $(MAKE) clean
-	cd programs/longtwo; $(MAKE) clean
-	cd programs/keyboard; $(MAKE) clean
-	cd programs/tsh; $(MAKE) clean
 	cd tlib/; $(MAKE) clean
 	rm -f *.bin
 	rm -f *.flp

programs/Makefile

@@ -0,0 +1,55 @@
+.PHONY: default clean force_look
+
+default: dist
+
+tlib/libtlib.a: force_look
+	cd ../tlib; $(MAKE)
+
+one: force_look tlib/libtlib.a
+	cd one; $(MAKE) a.out
+
+hello: force_look tlib/libtlib.a
+	cd hello; $(MAKE) a.out
+
+long: force_look tlib/libtlib.a
+	cd long; $(MAKE) a.out
+
+longone: force_look tlib/libtlib.a
+	cd longone; $(MAKE) a.out
+
+longtwo: force_look tlib/libtlib.a
+	cd longtwo; $(MAKE) a.out
+
+loop: force_look tlib/libtlib.a
+	cd loop; $(MAKE) a.out
+
+keyboard: force_look tlib/libtlib.a
+	cd keyboard; $(MAKE) a.out
+
+tsh: force_look tlib/libtlib.a
+	cd tsh; $(MAKE) tsh
+
+dist: one hello long loop longone longtwo keyboard tsh
+	mkdir dist
+	cp one/a.out dist/one
+	cp hello/a.out dist/hello
+	cp long/a.out dist/long
+	cp longone/a.out dist/longone
+	cp longtwo/a.out dist/longtwo
+	cp loop/a.out dist/loop
+	cp keyboard/a.out dist/keyboard
+	cp tsh/tsh dist/tsh
+
+force_look:
+	true
+
+clean:
+	cd one; $(MAKE) clean
+	cd hello; $(MAKE) clean
+	cd long;$(MAKE) clean
+	cd loop; $(MAKE) clean
+	cd longone; $(MAKE) clean
+	cd longtwo; $(MAKE) clean
+	cd keyboard; $(MAKE) clean
+	cd tsh; $(MAKE) clean
+	rm -rf dist

programs/hello/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out

programs/keyboard/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out

programs/long/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out

programs/longone/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out

programs/longtwo/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out

programs/loop/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o a.out main.cpp.o
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out

programs/one/Makefile

@@ -11,5 +11,5 @@ a.out: main.cpp.o
 	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm *.cpp.o
+	rm -f *.cpp.o
 	rm -rf a.out