Update programs makefile

.gitignore

@@ -7,34 +7,7 @@
 commands
 mnt
 *.a
-programs/tsh/tsh
+programs/*/debug
-programs/keyboard/keyboard
-programs/cpuid/cpuid
-programs/args/args
-programs/shutdown/shutdown
-programs/reboot/reboot
-programs/stat/stat
-programs/cat/cat
-programs/which/which
-programs/long/long
-programs/loop/loop
-programs/keyboard/keyboard
-programs/writer/writer
-programs/longtwo/longtwo
-programs/longone/longone
-programs/pwd/pwd
-programs/which/which
-programs/readelf/readelf
-programs/touch/touch
-programs/mkdir/mkdir
-programs/rm/rm
-programs/date/date
-programs/ls/ls
-programs/lspci/lspci
-programs/lse820/lse820
-programs/mount/mount
-programs/uptime/uptime
-programs/df/df
 programs/dist/
 tstl/tester
 

programs/Makefile

@@ -1,6 +1,6 @@
 .PHONY: dist default clean force_look
 
-PROGRAMS=long loop longone longtwo keyboard tsh cpuid shutdown reboot args stat cat which readelf touch mkdir rm date ls lspci lse820 mount df uptime writer
+PROGRAMS=long loop longone longtwo keyboard tsh cpuid shutdown reboot args stat cat which readelf touch mkdir rm date ls lspci lse820 mount df uptime writer divzero
 
 default: dist
 

programs/args/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: args
+EXEC_NAME=args
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-args: main.cpp.o
-	$(CXX) -o args main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf args
+	@ rm -rf debug

programs/cat/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: cat
+EXEC_NAME=cat
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-cat: main.cpp.o
-	$(CXX) -o cat main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf cat
+	@ rm -rf debug

programs/cpuid/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: cpuid
+EXEC_NAME=cpuid
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-cpuid: main.cpp.o
-	$(CXX) -o cpuid main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf cpuid
+	@ rm -rf debug

programs/date/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: date
+EXEC_NAME=date
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-date: main.cpp.o
-	$(CXX) -o date main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf date
+	@ rm -rf debug

programs/df/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: df
+EXEC_NAME=df
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-df: main.cpp.o
-	$(CXX) -o df main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf df
+	@ rm -rf debug

programs/keyboard/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: keyboard
+EXEC_NAME=divzero
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-keyboard: main.cpp.o
-	$(CXX) -o keyboard main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf keyboard
+	@ rm -rf debug

programs/long/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: long
+EXEC_NAME=long
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-long: main.cpp.o
-	$(CXX) -o long main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf long
+	@ rm -rf debug

programs/longone/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: longone
+EXEC_NAME=longone
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-longone: main.cpp.o
-	$(CXX) -o longone main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf longone
+	@ rm -rf debug

programs/longtwo/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: longtwo
+EXEC_NAME=longtwo
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-longtwo: main.cpp.o
-	$(CXX) -o longtwo main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf longtwo
+	@ rm -rf debug

programs/loop/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: loop
+EXEC_NAME=loop
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-loop: main.cpp.o
-	$(CXX) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o loop main.cpp.o
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf loop
+	@ rm -rf debug

programs/ls/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: ls
+EXEC_NAME=ls
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-ls: main.cpp.o
-	$(CXX) -o ls main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf ls
+	@ rm -rf debug

programs/lse820/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: lse820
+EXEC_NAME=lse820
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-lse820: main.cpp.o
-	$(CXX) -o lse820 main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf lspci
+	@ rm -rf debug

programs/lspci/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: lspci
+EXEC_NAME=lspci
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-lspci: main.cpp.o
-	$(CXX) -o lspci main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf lspci
+	@ rm -rf debug

programs/mkdir/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: mkdir
+EXEC_NAME=mkdir
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-mkdir: main.cpp.o
-	$(CXX) -o mkdir main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf mkdir
+	@ rm -rf debug

programs/mount/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: mount
+EXEC_NAME=mount
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-mount: main.cpp.o
-	$(CXX) -o mount main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf mount
+	@ rm -rf debug

programs/readelf/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: readelf
+EXEC_NAME=readelf
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-readelf: main.cpp.o
-	$(CXX) -o readelf main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf readelf
+	@ rm -rf debug

programs/reboot/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: reboot
+EXEC_NAME=reboot
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-reboot: main.cpp.o
-	$(CXX) -o reboot main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf reboot
+	@ rm -rf debug

programs/rm/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: rm
+EXEC_NAME=rm
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-rm: main.cpp.o
-	$(CXX) -o rm main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf rm
+	@ rm -rf debug

programs/shutdown/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: shutdown
+EXEC_NAME=shutdown
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-shutdown: main.cpp.o
-	$(CXX) -o shutdown main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf shutdown
+	@ rm -rf debug

programs/stat/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: stat
+EXEC_NAME=stat
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-stat: main.cpp.o
-	$(CXX) -o stat main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf stat
+	@ rm -rf debug

programs/touch/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: touch
+EXEC_NAME=touch
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-touch: main.cpp.o
-	$(CXX) -o touch main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf touch
+	@ rm -rf debug

programs/tsh/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: tsh
+EXEC_NAME=tsh
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-tsh: main.cpp.o
-	$(CXX) -o tsh main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf tsh
+	@ rm -rf debug

programs/uptime/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: uptime
+EXEC_NAME=uptime
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-uptime: main.cpp.o
-	$(CXX) -o uptime main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf uptime
+	@ rm -rf debug

programs/which/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: which
+EXEC_NAME=which
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-which: main.cpp.o
-	$(CXX) -o which main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf which
+	@ rm -rf debug

programs/writer/Makefile

@@ -1,15 +1,14 @@
 .PHONY: default clean
 
-default: writer
+EXEC_NAME=writer
+
+default: link
 
 include ../../cpp.mk
 
-%.cpp.o: src/%.cpp
+$(eval $(call program_compile_cpp_folder,src))
-	$(CXX) -c $< -o $@ $(PROGRAM_FLAGS)
+$(eval $(call program_link_executable,$(EXEC_NAME)))
-
-writer: main.cpp.o
-	$(CXX) -o writer main.cpp.o $(PROGRAM_LINK_FLAGS)
 
 clean:
-	rm -f *.cpp.o
+	@ echo -e "Remove compiled files"
-	rm -rf writer
+	@ rm -rf debug