From 8e4bd5f81c6a41efba90baec1e7cdff02b00cb67 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Sat, 6 Aug 2016 20:22:26 +0200 Subject: [PATCH] Update programs makefile --- .gitignore | 29 +---------------------------- programs/Makefile | 2 +- programs/args/Makefile | 15 +++++++-------- programs/cat/Makefile | 15 +++++++-------- programs/cpuid/Makefile | 15 +++++++-------- programs/date/Makefile | 15 +++++++-------- programs/df/Makefile | 15 +++++++-------- programs/keyboard/Makefile | 15 +++++++-------- programs/long/Makefile | 15 +++++++-------- programs/longone/Makefile | 15 +++++++-------- programs/longtwo/Makefile | 15 +++++++-------- programs/loop/Makefile | 15 +++++++-------- programs/ls/Makefile | 15 +++++++-------- programs/lse820/Makefile | 15 +++++++-------- programs/lspci/Makefile | 15 +++++++-------- programs/mkdir/Makefile | 15 +++++++-------- programs/mount/Makefile | 15 +++++++-------- programs/readelf/Makefile | 15 +++++++-------- programs/reboot/Makefile | 15 +++++++-------- programs/rm/Makefile | 15 +++++++-------- programs/shutdown/Makefile | 15 +++++++-------- programs/stat/Makefile | 15 +++++++-------- programs/touch/Makefile | 15 +++++++-------- programs/tsh/Makefile | 15 +++++++-------- programs/uptime/Makefile | 15 +++++++-------- programs/which/Makefile | 15 +++++++-------- programs/writer/Makefile | 15 +++++++-------- 27 files changed, 177 insertions(+), 229 deletions(-) diff --git a/.gitignore b/.gitignore index 282fd1d7..7bc026e2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,34 +7,7 @@ commands mnt *.a -programs/tsh/tsh -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/*/debug programs/dist/ tstl/tester diff --git a/programs/Makefile b/programs/Makefile index ae63dc9b..fbf0de28 100644 --- a/programs/Makefile +++ b/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 diff --git a/programs/args/Makefile b/programs/args/Makefile index dc6f8f1b..9ffd9489 100644 --- a/programs/args/Makefile +++ b/programs/args/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: args +EXEC_NAME=args + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -args: main.cpp.o - $(CXX) -o args main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf args + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/cat/Makefile b/programs/cat/Makefile index fc2c057e..08d10ad0 100644 --- a/programs/cat/Makefile +++ b/programs/cat/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: cat +EXEC_NAME=cat + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -cat: main.cpp.o - $(CXX) -o cat main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf cat + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/cpuid/Makefile b/programs/cpuid/Makefile index 5ff40373..a64f0791 100644 --- a/programs/cpuid/Makefile +++ b/programs/cpuid/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: cpuid +EXEC_NAME=cpuid + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -cpuid: main.cpp.o - $(CXX) -o cpuid main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf cpuid + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/date/Makefile b/programs/date/Makefile index 1b9c1be5..e66b2b3c 100644 --- a/programs/date/Makefile +++ b/programs/date/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: date +EXEC_NAME=date + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -date: main.cpp.o - $(CXX) -o date main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf date + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/df/Makefile b/programs/df/Makefile index e8a4f105..974c8312 100644 --- a/programs/df/Makefile +++ b/programs/df/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: df +EXEC_NAME=df + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -df: main.cpp.o - $(CXX) -o df main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf df + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/keyboard/Makefile b/programs/keyboard/Makefile index 7ec8bf8a..1d65bd37 100644 --- a/programs/keyboard/Makefile +++ b/programs/keyboard/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: keyboard +EXEC_NAME=divzero + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -keyboard: main.cpp.o - $(CXX) -o keyboard main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf keyboard + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/long/Makefile b/programs/long/Makefile index e8428d7c..7ab2fa0a 100644 --- a/programs/long/Makefile +++ b/programs/long/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: long +EXEC_NAME=long + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -long: main.cpp.o - $(CXX) -o long main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf long + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/longone/Makefile b/programs/longone/Makefile index 2ee09269..b96349cb 100644 --- a/programs/longone/Makefile +++ b/programs/longone/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: longone +EXEC_NAME=longone + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -longone: main.cpp.o - $(CXX) -o longone main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf longone + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/longtwo/Makefile b/programs/longtwo/Makefile index 60b9ac12..a88f1f56 100644 --- a/programs/longtwo/Makefile +++ b/programs/longtwo/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: longtwo +EXEC_NAME=longtwo + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -longtwo: main.cpp.o - $(CXX) -o longtwo main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf longtwo + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/loop/Makefile b/programs/loop/Makefile index ec547f28..dd36ba94 100644 --- a/programs/loop/Makefile +++ b/programs/loop/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: loop +EXEC_NAME=loop + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@ - -loop: main.cpp.o - $(CXX) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o loop main.cpp.o +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf loop + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/ls/Makefile b/programs/ls/Makefile index e52eda19..83dd1f80 100644 --- a/programs/ls/Makefile +++ b/programs/ls/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: ls +EXEC_NAME=ls + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -ls: main.cpp.o - $(CXX) -o ls main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf ls + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/lse820/Makefile b/programs/lse820/Makefile index b8ef7dc5..8db0b1cf 100644 --- a/programs/lse820/Makefile +++ b/programs/lse820/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: lse820 +EXEC_NAME=lse820 + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -lse820: main.cpp.o - $(CXX) -o lse820 main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf lspci + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/lspci/Makefile b/programs/lspci/Makefile index 7ce5e136..ee68f274 100644 --- a/programs/lspci/Makefile +++ b/programs/lspci/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: lspci +EXEC_NAME=lspci + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -lspci: main.cpp.o - $(CXX) -o lspci main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf lspci + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/mkdir/Makefile b/programs/mkdir/Makefile index 906d94e3..b5108090 100644 --- a/programs/mkdir/Makefile +++ b/programs/mkdir/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: mkdir +EXEC_NAME=mkdir + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -mkdir: main.cpp.o - $(CXX) -o mkdir main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf mkdir + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/mount/Makefile b/programs/mount/Makefile index 1b4bd6e1..7cfdab0a 100644 --- a/programs/mount/Makefile +++ b/programs/mount/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: mount +EXEC_NAME=mount + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -mount: main.cpp.o - $(CXX) -o mount main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf mount + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/readelf/Makefile b/programs/readelf/Makefile index 013f316c..7bc9fa6a 100644 --- a/programs/readelf/Makefile +++ b/programs/readelf/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: readelf +EXEC_NAME=readelf + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -readelf: main.cpp.o - $(CXX) -o readelf main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf readelf + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/reboot/Makefile b/programs/reboot/Makefile index 8a9ba019..dbd97f47 100644 --- a/programs/reboot/Makefile +++ b/programs/reboot/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: reboot +EXEC_NAME=reboot + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -reboot: main.cpp.o - $(CXX) -o reboot main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf reboot + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/rm/Makefile b/programs/rm/Makefile index 1860c1c7..40d61dd0 100644 --- a/programs/rm/Makefile +++ b/programs/rm/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: rm +EXEC_NAME=rm + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -rm: main.cpp.o - $(CXX) -o rm main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf rm + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/shutdown/Makefile b/programs/shutdown/Makefile index 1669abd4..e60fbdf4 100644 --- a/programs/shutdown/Makefile +++ b/programs/shutdown/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: shutdown +EXEC_NAME=shutdown + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -shutdown: main.cpp.o - $(CXX) -o shutdown main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf shutdown + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/stat/Makefile b/programs/stat/Makefile index ed1cbf12..24d7503d 100644 --- a/programs/stat/Makefile +++ b/programs/stat/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: stat +EXEC_NAME=stat + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -stat: main.cpp.o - $(CXX) -o stat main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf stat + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/touch/Makefile b/programs/touch/Makefile index 5b3733e0..d0e19c8e 100644 --- a/programs/touch/Makefile +++ b/programs/touch/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: touch +EXEC_NAME=touch + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -touch: main.cpp.o - $(CXX) -o touch main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf touch + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/tsh/Makefile b/programs/tsh/Makefile index 97482409..d02d25e2 100644 --- a/programs/tsh/Makefile +++ b/programs/tsh/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: tsh +EXEC_NAME=tsh + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -tsh: main.cpp.o - $(CXX) -o tsh main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf tsh + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/uptime/Makefile b/programs/uptime/Makefile index b51817b7..91b6ca71 100644 --- a/programs/uptime/Makefile +++ b/programs/uptime/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: uptime +EXEC_NAME=uptime + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -uptime: main.cpp.o - $(CXX) -o uptime main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf uptime + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/which/Makefile b/programs/which/Makefile index afd73ad2..14543a27 100644 --- a/programs/which/Makefile +++ b/programs/which/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: which +EXEC_NAME=which + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -which: main.cpp.o - $(CXX) -o which main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf which + @ echo -e "Remove compiled files" + @ rm -rf debug diff --git a/programs/writer/Makefile b/programs/writer/Makefile index 90575905..6ae7e6b7 100644 --- a/programs/writer/Makefile +++ b/programs/writer/Makefile @@ -1,15 +1,14 @@ .PHONY: default clean -default: writer +EXEC_NAME=writer + +default: link include ../../cpp.mk -%.cpp.o: src/%.cpp - $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) - -writer: main.cpp.o - $(CXX) -o writer main.cpp.o $(PROGRAM_LINK_FLAGS) +$(eval $(call program_compile_cpp_folder,src)) +$(eval $(call program_link_executable,$(EXEC_NAME))) clean: - rm -f *.cpp.o - rm -rf writer + @ echo -e "Remove compiled files" + @ rm -rf debug