aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonkaars <loek@pipeframe.xyz>2022-11-09 11:48:12 +0100
committerlonkaars <loek@pipeframe.xyz>2022-11-09 11:48:12 +0100
commitffae2cb77bfb3263146a2de0deedf6528d4df461 (patch)
tree88e4b61087069f8ce5badadbc6264d20b8a051d5
parentd797758769d033c64babdf77ea6b64262f792b23 (diff)
repository aanpassen voor oop2
-rw-r--r--.gitignore2
-rw-r--r--makefile19
-rw-r--r--oop1w1/Opteller.cpp (renamed from week-1/Opteller.cpp)0
-rw-r--r--oop1w1/Opteller.h (renamed from week-1/Opteller.h)0
-rw-r--r--oop1w1/main.cpp (renamed from week-1/main.cpp)0
l---------oop1w1/makefile (renamed from week-1/makefile)0
-rw-r--r--oop1w2/Driehoek.cpp (renamed from week-2/Driehoek.cpp)0
-rw-r--r--oop1w2/Driehoek.h (renamed from week-2/Driehoek.h)0
-rw-r--r--oop1w2/Rechthoek.cpp (renamed from week-2/Rechthoek.cpp)0
-rw-r--r--oop1w2/Rechthoek.h (renamed from week-2/Rechthoek.h)0
-rw-r--r--oop1w2/Vorm.cpp (renamed from week-2/Vorm.cpp)0
-rw-r--r--oop1w2/Vorm.h (renamed from week-2/Vorm.h)0
-rw-r--r--oop1w2/main.cpp (renamed from week-2/main.cpp)0
l---------oop1w2/makefile (renamed from week-2/makefile)0
-rw-r--r--oop1w3/ETer.cpp (renamed from week-3/ETer.cpp)0
-rw-r--r--oop1w3/ETer.h (renamed from week-3/ETer.h)0
-rw-r--r--oop1w3/IBeroep.cpp (renamed from week-3/IBeroep.cpp)0
-rw-r--r--oop1w3/IBeroep.h (renamed from week-3/IBeroep.h)0
-rw-r--r--oop1w3/Persoon.cpp (renamed from week-3/Persoon.cpp)0
-rw-r--r--oop1w3/Persoon.h (renamed from week-3/Persoon.h)0
-rw-r--r--oop1w3/TIer.cpp (renamed from week-3/TIer.cpp)0
-rw-r--r--oop1w3/TIer.h (renamed from week-3/TIer.h)0
-rw-r--r--oop1w3/main.cpp (renamed from week-3/main.cpp)0
l---------oop1w3/makefile (renamed from week-3/makefile)0
-rw-r--r--oop1w4/Persoon.cpp (renamed from week-4/Persoon.cpp)0
-rw-r--r--oop1w4/Persoon.h (renamed from week-4/Persoon.h)0
-rw-r--r--oop1w4/Spel.cpp (renamed from week-4/Spel.cpp)0
-rw-r--r--oop1w4/Spel.h (renamed from week-4/Spel.h)0
-rw-r--r--oop1w4/main.cpp (renamed from week-4/main.cpp)0
l---------oop1w4/makefile (renamed from week-4/makefile)0
-rw-r--r--oop1w5/StringWeek5.cpp (renamed from week-5/StringWeek5.cpp)0
-rw-r--r--oop1w5/StringWeek5.h (renamed from week-5/StringWeek5.h)0
-rw-r--r--oop1w5/StringWeek5.hpp (renamed from week-5/StringWeek5.hpp)0
-rw-r--r--oop1w5/main.cpp (renamed from week-5/main.cpp)0
l---------oop1w5/makefile (renamed from week-5/makefile)0
-rw-r--r--oop1w6/Punt.cpp (renamed from week-6/Punt.cpp)0
-rw-r--r--oop1w6/Punt.h (renamed from week-6/Punt.h)0
-rw-r--r--oop1w6/PuntContainer.cpp (renamed from week-6/PuntContainer.cpp)0
-rw-r--r--oop1w6/PuntContainer.h (renamed from week-6/PuntContainer.h)0
-rw-r--r--oop1w6/main.cpp (renamed from week-6/main.cpp)0
l---------oop1w6/makefile (renamed from week-6/makefile)0
-rw-r--r--readme.md12
42 files changed, 21 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index aca116d..4cf3fc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
**/*.pdf
**/main
**/compile_commands.json
+**/.cache
+
diff --git a/makefile b/makefile
index 4e05b91..acb6c56 100644
--- a/makefile
+++ b/makefile
@@ -1,16 +1,11 @@
MK = make -j
-WEKEN = $(wildcard week-*)
+WEKEN := $(wildcard oop*w*)
+TARGETS := all clean compile_commands zip
-submake = $(foreach WEEK,$(WEKEN), $(MK) -C $(WEEK) $(1);)
+_: all
-all:
- $(call submake)
+.PHONY: $(TARGETS) $(WEKEN)
+$(TARGETS): $(WEKEN)
+$(WEKEN):
+ $(MK) -C $@ $(MAKECMDGOALS)
-clean:
- $(call submake, clean)
-
-compile_commands:
- $(call submake, compile_commands)
-
-zip:
- $(call submake, zip)
diff --git a/week-1/Opteller.cpp b/oop1w1/Opteller.cpp
index 41efee0..41efee0 100644
--- a/week-1/Opteller.cpp
+++ b/oop1w1/Opteller.cpp
diff --git a/week-1/Opteller.h b/oop1w1/Opteller.h
index 2f21d79..2f21d79 100644
--- a/week-1/Opteller.h
+++ b/oop1w1/Opteller.h
diff --git a/week-1/main.cpp b/oop1w1/main.cpp
index 0d895f4..0d895f4 100644
--- a/week-1/main.cpp
+++ b/oop1w1/main.cpp
diff --git a/week-1/makefile b/oop1w1/makefile
index a4e84c6..a4e84c6 120000
--- a/week-1/makefile
+++ b/oop1w1/makefile
diff --git a/week-2/Driehoek.cpp b/oop1w2/Driehoek.cpp
index 1c1323c..1c1323c 100644
--- a/week-2/Driehoek.cpp
+++ b/oop1w2/Driehoek.cpp
diff --git a/week-2/Driehoek.h b/oop1w2/Driehoek.h
index f8a3a37..f8a3a37 100644
--- a/week-2/Driehoek.h
+++ b/oop1w2/Driehoek.h
diff --git a/week-2/Rechthoek.cpp b/oop1w2/Rechthoek.cpp
index 1f7b313..1f7b313 100644
--- a/week-2/Rechthoek.cpp
+++ b/oop1w2/Rechthoek.cpp
diff --git a/week-2/Rechthoek.h b/oop1w2/Rechthoek.h
index 4f526f9..4f526f9 100644
--- a/week-2/Rechthoek.h
+++ b/oop1w2/Rechthoek.h
diff --git a/week-2/Vorm.cpp b/oop1w2/Vorm.cpp
index c919d08..c919d08 100644
--- a/week-2/Vorm.cpp
+++ b/oop1w2/Vorm.cpp
diff --git a/week-2/Vorm.h b/oop1w2/Vorm.h
index 17cf486..17cf486 100644
--- a/week-2/Vorm.h
+++ b/oop1w2/Vorm.h
diff --git a/week-2/main.cpp b/oop1w2/main.cpp
index 69db85b..69db85b 100644
--- a/week-2/main.cpp
+++ b/oop1w2/main.cpp
diff --git a/week-2/makefile b/oop1w2/makefile
index a4e84c6..a4e84c6 120000
--- a/week-2/makefile
+++ b/oop1w2/makefile
diff --git a/week-3/ETer.cpp b/oop1w3/ETer.cpp
index f2eebd0..f2eebd0 100644
--- a/week-3/ETer.cpp
+++ b/oop1w3/ETer.cpp
diff --git a/week-3/ETer.h b/oop1w3/ETer.h
index 9f7ac8f..9f7ac8f 100644
--- a/week-3/ETer.h
+++ b/oop1w3/ETer.h
diff --git a/week-3/IBeroep.cpp b/oop1w3/IBeroep.cpp
index 9e4f97e..9e4f97e 100644
--- a/week-3/IBeroep.cpp
+++ b/oop1w3/IBeroep.cpp
diff --git a/week-3/IBeroep.h b/oop1w3/IBeroep.h
index 8812010..8812010 100644
--- a/week-3/IBeroep.h
+++ b/oop1w3/IBeroep.h
diff --git a/week-3/Persoon.cpp b/oop1w3/Persoon.cpp
index d58028c..d58028c 100644
--- a/week-3/Persoon.cpp
+++ b/oop1w3/Persoon.cpp
diff --git a/week-3/Persoon.h b/oop1w3/Persoon.h
index 32ff651..32ff651 100644
--- a/week-3/Persoon.h
+++ b/oop1w3/Persoon.h
diff --git a/week-3/TIer.cpp b/oop1w3/TIer.cpp
index 801f417..801f417 100644
--- a/week-3/TIer.cpp
+++ b/oop1w3/TIer.cpp
diff --git a/week-3/TIer.h b/oop1w3/TIer.h
index 35147e4..35147e4 100644
--- a/week-3/TIer.h
+++ b/oop1w3/TIer.h
diff --git a/week-3/main.cpp b/oop1w3/main.cpp
index b6b5019..b6b5019 100644
--- a/week-3/main.cpp
+++ b/oop1w3/main.cpp
diff --git a/week-3/makefile b/oop1w3/makefile
index a4e84c6..a4e84c6 120000
--- a/week-3/makefile
+++ b/oop1w3/makefile
diff --git a/week-4/Persoon.cpp b/oop1w4/Persoon.cpp
index de5195d..de5195d 100644
--- a/week-4/Persoon.cpp
+++ b/oop1w4/Persoon.cpp
diff --git a/week-4/Persoon.h b/oop1w4/Persoon.h
index df4a3f2..df4a3f2 100644
--- a/week-4/Persoon.h
+++ b/oop1w4/Persoon.h
diff --git a/week-4/Spel.cpp b/oop1w4/Spel.cpp
index 5ddc355..5ddc355 100644
--- a/week-4/Spel.cpp
+++ b/oop1w4/Spel.cpp
diff --git a/week-4/Spel.h b/oop1w4/Spel.h
index 9ed04ba..9ed04ba 100644
--- a/week-4/Spel.h
+++ b/oop1w4/Spel.h
diff --git a/week-4/main.cpp b/oop1w4/main.cpp
index b81a711..b81a711 100644
--- a/week-4/main.cpp
+++ b/oop1w4/main.cpp
diff --git a/week-4/makefile b/oop1w4/makefile
index a4e84c6..a4e84c6 120000
--- a/week-4/makefile
+++ b/oop1w4/makefile
diff --git a/week-5/StringWeek5.cpp b/oop1w5/StringWeek5.cpp
index ae8ba9f..ae8ba9f 100644
--- a/week-5/StringWeek5.cpp
+++ b/oop1w5/StringWeek5.cpp
diff --git a/week-5/StringWeek5.h b/oop1w5/StringWeek5.h
index 8c2bdac..8c2bdac 100644
--- a/week-5/StringWeek5.h
+++ b/oop1w5/StringWeek5.h
diff --git a/week-5/StringWeek5.hpp b/oop1w5/StringWeek5.hpp
index ed71e75..ed71e75 100644
--- a/week-5/StringWeek5.hpp
+++ b/oop1w5/StringWeek5.hpp
diff --git a/week-5/main.cpp b/oop1w5/main.cpp
index a2603fa..a2603fa 100644
--- a/week-5/main.cpp
+++ b/oop1w5/main.cpp
diff --git a/week-5/makefile b/oop1w5/makefile
index a4e84c6..a4e84c6 120000
--- a/week-5/makefile
+++ b/oop1w5/makefile
diff --git a/week-6/Punt.cpp b/oop1w6/Punt.cpp
index 707047e..707047e 100644
--- a/week-6/Punt.cpp
+++ b/oop1w6/Punt.cpp
diff --git a/week-6/Punt.h b/oop1w6/Punt.h
index b56e798..b56e798 100644
--- a/week-6/Punt.h
+++ b/oop1w6/Punt.h
diff --git a/week-6/PuntContainer.cpp b/oop1w6/PuntContainer.cpp
index e673472..e673472 100644
--- a/week-6/PuntContainer.cpp
+++ b/oop1w6/PuntContainer.cpp
diff --git a/week-6/PuntContainer.h b/oop1w6/PuntContainer.h
index 58c7875..58c7875 100644
--- a/week-6/PuntContainer.h
+++ b/oop1w6/PuntContainer.h
diff --git a/week-6/main.cpp b/oop1w6/main.cpp
index 701ac33..701ac33 100644
--- a/week-6/main.cpp
+++ b/oop1w6/main.cpp
diff --git a/week-6/makefile b/oop1w6/makefile
index a4e84c6..a4e84c6 120000
--- a/week-6/makefile
+++ b/oop1w6/makefile
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..38134e7
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,12 @@
+# oop huiswerk
+
+hier staan de uitwerkingen van de huiswerkopgaven voor object-georiƫnteerd
+programmeren 1 en 2. de mapnamen zijn `oop<1 of 2>w<weeknummer>`. gelieve als
+naslagwerk te gebruiken.
+
+deze map bevat een makefile die alle weekopdrachten tegelijk kan compileren,
+terwijl elke week een makefile heeft die een snelkoppeling is naar week.mk. er
+zijn voor de rest geen rare uitzonderingen bij compileren, dus waarschijnlijk
+kunnen deze bronbestanden ook met weinig aanpassingen compileren in IDE's als
+Eclipse of Visual Studio Community.
+