Improve makefile

.gitignore

@@ -15,4 +15,12 @@ programs/shutdown/shutdown
 programs/reboot/reboot
 programs/stat/stat
 programs/cat/cat
+programs/which/which
+programs/one/one
+programs/long/long
+programs/hello/hello
+programs/loop/loop
+programs/keyboard/keyboard
+programs/longtwo/longtwo
+programs/longone/longone
 programs/dist/

programs/Makefile

@@ -1,4 +1,4 @@
-.PHONY: default clean force_look
+.PHONY: dist default clean force_look
 
 PROGRAMS=one hello long loop longone longtwo keyboard tsh cpuid shutdown reboot args stat cat which
 
@@ -7,87 +7,18 @@ 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
-
-cpuid: force_look tlib/libtlib.a
-	cd cpuid; $(MAKE) cpuid
-
-tsh: force_look tlib/libtlib.a
-	cd tsh; $(MAKE) tsh
-
-reboot: force_look tlib/libtlib.a
-	cd reboot; $(MAKE) reboot
-
-shutdown: force_look tlib/libtlib.a
-	cd shutdown; $(MAKE) shutdown
-
-args: force_look tlib/libtlib.a
-	cd args; $(MAKE) args
-
-stat: force_look tlib/libtlib.a
-	cd stat; $(MAKE) stat
-
-cat: force_look tlib/libtlib.a
-	cd cat; $(MAKE) cat
-
-which: force_look tlib/libtlib.a
-	cd which; $(MAKE) which
-
-dist: $(PROGRAMS)
-	mkdir -p 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 cpuid/cpuid dist/
-	cp tsh/tsh dist/
-	cp reboot/reboot dist/
-	cp shutdown/shutdown dist/
-	cp args/args dist/
-	cp stat/stat dist/
-	cp cat/cat dist/
-	cp which/which dist/
-	strip dist/*
-
 force_look:
 	true
 
+dist: tlib/libtlib.a
+	$(foreach var,$(PROGRAMS),cd $(var); $(MAKE); cd ..;)
+	mkdir -p dist
+	$(foreach var,$(PROGRAMS),cp $(var)/$(var) dist/;)
+	strip dist/*
+
 clean:
-	cd one; $(MAKE) clean
+	echo $(PROGRAMS_MAKE)
-	cd hello; $(MAKE) clean
+	echo $(PROGRAMS_CLEAN)
-	cd long;$(MAKE) clean
+	echo $(PROGRAMS)
-	cd loop; $(MAKE) clean
+	$(foreach var,$(PROGRAMS),cd $(var); $(MAKE) clean; cd ..;)
-	cd longone; $(MAKE) clean
-	cd longtwo; $(MAKE) clean
-	cd keyboard; $(MAKE) clean
-	cd tsh; $(MAKE) clean
-	cd cpuid; $(MAKE) clean
-	cd reboot; $(MAKE) clean
-	cd shutdown; $(MAKE) clean
-	cd args; $(MAKE) clean
-	cd stat; $(MAKE) clean
-	cd cat; $(MAKE) clean
-	cd which; $(MAKE) clean
 	rm -rf dist

programs/hello/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: hello
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
 
-a.out: main.cpp.o
+hello: main.cpp.o
-	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
+	$(CC) -o hello main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf hello

programs/keyboard/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: keyboard
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
 
-a.out: main.cpp.o
+keyboard: main.cpp.o
-	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
+	$(CC) -o keyboard main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf keyboard

programs/long/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: long
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
 
-a.out: main.cpp.o
+long: main.cpp.o
-	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
+	$(CC) -o long main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf long

programs/longone/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: longone
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
 
-a.out: main.cpp.o
+longone: main.cpp.o
-	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
+	$(CC) -o longone main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf longone

programs/longtwo/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: longtwo
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
 
-a.out: main.cpp.o
+longtwo: main.cpp.o
-	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
+	$(CC) -o longtwo main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf longtwo

programs/loop/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: loop
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@
 
-a.out: main.cpp.o
+loop: main.cpp.o
-	$(CC) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o a.out main.cpp.o
+	$(CC) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o loop main.cpp.o
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf loop

programs/one/Makefile

@@ -1,15 +1,15 @@
 .PHONY: default clean
 
-default: a.out
+default: one
 
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
 	$(CC) -c $< -o $@ $(PROGRAM_FLAGS)
 
-a.out: main.cpp.o
+one: main.cpp.o
-	$(CC) -o a.out main.cpp.o $(PROGRAM_LINK_FLAGS)
+	$(CC) -o one main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
 	rm -f *.cpp.o
-	rm -rf a.out
+	rm -rf one