From f93ce8a8789d31a418aac76df5944540a5b922f7 Mon Sep 17 00:00:00 2001 From: Wessel Date: Wed, 5 Oct 2022 12:51:30 +0200 Subject: [PATCH] docs: Add makefile documentation + main.c cleanup --- .gitignore | 1 + makefile | 36 +++++++++++++++++++++------------ obj/main.o | Bin 1800 -> 1179 bytes src/main.c | 7 +------ tmp/pgp.txt | 52 ------------------------------------------------ tmp/pgp.txt.gpg | Bin 3223 -> 0 bytes 6 files changed, 25 insertions(+), 71 deletions(-) create mode 100644 .gitignore delete mode 100644 tmp/pgp.txt delete mode 100644 tmp/pgp.txt.gpg diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a83a5ae --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +tmp/**/* \ No newline at end of file diff --git a/makefile b/makefile index 6175daa..82d8edb 100644 --- a/makefile +++ b/makefile @@ -1,31 +1,41 @@ +# C compiler to use CC := gcc +# Directory mappings SRC_DIR := src LIB_DIR := lib OBJ_DIR := obj OUT_DIR := out INC_DIR := include + +# Map all object and source files SRC_FILES := $(wildcard $(SRC_DIR)/*.c) $(wildcard $(LIB_DIR)/*.c) OBJ_FILES := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRC_FILES)) +# All optional libs and Cflags to append to the final command LIBS := $(mysql_config --libs) $(mysql_config --cflags) -lmysqlclient CFLAGS := -I$(INC_DIR) -dev: $(OBJ_FILES) - $(CC) -o $(OUT_DIR)/$@ $^ $(CFLAGS) $(LIBS) && strace ./out/dev - -run: $(OBJ_FILES) - $(CC) -o $(OUT_DIR)/$@ $^ $(CFLAGS) $(LIBS) && ./out/run - -prod: $(OBJ_FILES) - $(CC) -o $(OUT_DIR)/$@ $^ $(CFLAGS) $(LIBS) - +# Special and default commands +.PHONY: clean help +.DEFAULT_GOAL := help +# Macro for creating object files $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(CC) -c -o $@ $< -.PHONY: clean +## All make commands ## +help: ## Lists all commands + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' -clean: -# rm -f $(OBJ_DIR)/*.o *~ core $(INC_DIR)/*~ - rm -f $(OBJ_DIR)/*.o $(OUT_DIR)/* \ No newline at end of file +clean: ## Clean up all object files and executables + rm -f $(OBJ_DIR)/*.o $(OUT_DIR)/* + +dev: $(OBJ_FILES) ## Build, run and debug the project + $(CC) -o $(OUT_DIR)/$@ $^ $(CFLAGS) $(LIBS) && strace ./out/dev + +run: $(OBJ_FILES) ## Build and run the project + $(CC) -o $(OUT_DIR)/$@ $^ $(CFLAGS) $(LIBS) && ./out/run + +prod: $(OBJ_FILES) ## Build the project + $(CC) -o $(OUT_DIR)/$@ $^ $(CFLAGS) $(LIBS) diff --git a/obj/main.o b/obj/main.o index 70aa7390b2cc02f53683e440b9685d061bc4596a..659c869ddcab0bb7917a24ff239d42e567cc781c 100644 GIT binary patch literal 1179 zcma)5O>5gg5S_K0;+E1L`UN?ZJ^0W*H)X$V9lg!oeMrQ}o;S>DuJWJ%S^iDP;Q z1PZzN++UKTq5Ug`9P$HtYCE%%@Varq12g;f&70LqJoUfc0g9^%z%zrYATl}549*M3 zrOE)lpoYT1wF+x%k09e4kFkIPk+ktnF_?(p4i- zNxZ6dnJyd1AdF9=WxZ9n(q7_y&XAx9=6ZP zJ`VdeZx+b*I88gto@M#lybmLXFNW>yHEcOXvv?nxcvy_l-|MiQVmDtrEz=X38iMXz z0dIs9BG>GQp;*T}$ILYdppH4iET%mBEAnDWU_XzNd0P_nonaq$BBj5yKAB8x=q0|^ fr*YZ`kJ>$7OHh%@yy2Pt96~UNRUo~gj7IPmA;EH$ literal 1800 zcmbtT&1w`u5U$z8#GgbrDk8+goJ2)ilT*k+Mivth5flQsgmHG#$u60{OwXFE7d;8y z@(4bL$AFhSf-fL=)SCw(R?SrHY?=`gEa<7KufMA5>8gJJ^u6rp7a?#Ualda2PLIU~!5Xw6VzmA)>CmK3Wx#pm5{t^ea8TZ&1oX$f0 z4;Jn+erVzM(7!rXxBM5x9^#@Jwk#vighL$k6BUAQbpBT7;1AFMKMRc6OY=?eH-jSR z21b`e=qLTckB4SAg0PqNL+!^p8DQ>K%zrC6EKo6Nh7n(%tks*N|5 zg5Rt~xni)skD7AY@$2?MnQz1N%n6foG7TjDngFaNUNp_6*yGflCa{6~9IcaH?IGa9F$AA kD5V`wZ_4f+LU6=Cv_j69aM}?vhgMVkI)l-OSs8ZxUo(__asU7T diff --git a/src/main.c b/src/main.c index cb9d8b6..760474b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,4 @@ -#include -#include -#include -#include - +/* main.c */ #include "../include/database.h" #include "../include/choicemenu.h" @@ -22,6 +18,5 @@ extern char _database[56]; void main() { init_mysql(); - choice_menu(); } \ No newline at end of file diff --git a/tmp/pgp.txt b/tmp/pgp.txt deleted file mode 100644 index b09e8bf..0000000 --- a/tmp/pgp.txt +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBGM8PhQBEADpxu2OQZK3QYJWvvS0OWlpJb+hsjB+bDslHiuurjeFH2+LYCk9 -Q0rOiIJAZDxaTFgFuBCasdWeCgRVyZVwrCyXjhr/mahJL9yO0+/v9XQmRL8HD6DZ -rsl8a4weI83sFQJCl0zn1toZN5YWIWSo3PM4wwaaAFhDEWK22mNR2b/xwzZb96G2 -EvIh0xU62/jJJkvPAhqrzqj0ECKT8xWAKpc6/NC9sQLM18i3OSGbcARxnxD4XzHf -8wd2bFmk8rB7tW3sEcH2cXrj1Zv3e4g2JFZzyhdlq8liPTzTlOrb4ec9fmZhuD8n -EmHSr2L61FrY/7FiotWslxBmn5f7n3wM7zQmflBvcgDFYh0RWnc2+GqWQ60+V7Qf -T8uLXZ7UZRaNmk+LdSeZZC5IuM+kL9FP82YZvNum3I2/pTiP007Uy6s4drWr2RU9 -SG8qRPId7BWXXAdZp/6yvQI1d9XTCXu13iJ0Krbb8LGIqWY2s1djFnrmgCGyWUiG -8+LU76bMw5jraLrPqblT1fAeLzfF1KOqXt2hR9Tq1PPPmK2nF2HnXWmFoC+VU+m0 -XVtpgLBNcTkKa9mUw9ZjXo4SC3SVWEFrViB2w/5RsMj8fVVTje9WgawsXLDne24i -6sEJp+W4K7bu1KL/OERY1cE0MpXFW8xEVJ7YSjoNG9qCUYB8Ec8bTIfbywARAQAB -tC1XZXNzZWwgVGlwIChHaXRIdWIgR1BHIEtleSkgPHdlc3NlbEBnbzJpdC5ldT6J -Ak4EEwEIADgWIQS0jePMDZqLKt2kFQ2rb8DBGNeSFAUCYzw+FAIbAwULCQgHAgYV -CgkICwIEFgIDAQIeAQIXgAAKCRCrb8DBGNeSFO/xD/9WsMnh4nqTOw+kvUuI0P36 -FOpoYjl3RMHPaJEwAhfJk6/C15xQv9RCzaMQ+wgbmr52Kyr4kiX4D2AU1IJclIH9 -UE2RFhZ3BlwGkYWvzJ+Q24/jMH5eSu1RlTjBC+Dd4aVqliqPCn9Ia4uXV9kBHkBD -T4NQd7JjgL1xlsXAN4cYgtXX6YKTxrfhr2+MTsdjUgduvfnr4SgLV7NFjtBZYliY -/ufoVzsXqMpPD1oO2CiTmW4mlak6Ee5QmAL0mzHXNIXorH6c0OMUZ5glYVxWsTYq -HTmRcqVi4qo/RxHxSZVZCQaYFIfuXsin5+9dGKXsfq67muZ4xTGTQP83vFZ09VOm -coinovsE4NO4MGyJDXnnjGOWzucVcnPtU+490427v6EH9W/PfSU6DV1L6n4NZbSb -jENSWtWnteRnW/M2TIDi6eei64jA3MLZzNk9kPirEWzd++M7Ol4RNKKPUQci0ov3 -MBRxsbw5+D3spEuFpPDJ1R3tyFe5UgQu0gM++WNtXuT/JIAv/XKKwaIEUFKSUhMt -omcLtShtob6Yn/5IwXn6zJyO0xjW1JdF3k1eQcjihoF4OetA6O9FNB7GVXJQcf12 -o/xilPqEzkjRtFeXfe8Lm11BHtIwTTFQe359eWkR50+15lRIfJJcdUtGUfEvssZd -DJGSiRvYMDpv5zhB4wTxb7kCDQRjPD4UARAAuWwvgUgelReUc2i82NG7uqe7LjG/ -8YrR0GDoe4j0MEsFCBq7tK3TCcKFmCPhKkqbwBrM3sXNQNVRhwzDva2jh0kbwB56 -S323vyVBA1zTtbp7773PyhE3CIGdU8L1d+/4Ua3rnghM+mzI2GrBZ3PF8vKMgWqU -nJpsg2+EPBENB5y/7loPNAX96f3iSirahnQ1CwOnXMdjroI+ZJo6nL542kJ0p4K7 -fNRlBoEXpmVrVCmQz6ZB2/HbJK7q6URd9WE4ArmDpowp2ryv8bvwWWdj68fbNJ2T -GIi+Kcvq+VlUmTs//rQV3DOx4WD+HZ5IhRm7MGyomO3S9gKM9pwkAzSyrGxYpBOc -lSQU8oyRfdak0820W49/9xt/QosaRlCpsIE+jvSSsHzfAEG+zpJHUtSx5h1AIG8J -mreWDtP7CPfMrUA2FiJy4Qo2Z/aK0GbCWdnKtX9ROOL5bwS0m9jj+wB86Inuk8dU -CZ0w2SlukfIwa8dXQWNOZ99JYlRJvmOssQn6BwChpfSf23YuZj7Awlus623kURtI -oLcvIYSkfnBvDdgwElKe94e4eCup+Q3EUFsFq/Cew+WBFw6eXeHErbV27AoS4Ywo -5PdMIfWpADlXKlgQtXbyrRrNoW2ThJvxXQmZQOGATCEURnbQ6ddNKa5bAUQgFw99 -SYsPS1+U6qRpicUAEQEAAYkCNgQYAQgAIBYhBLSN48wNmosq3aQVDatvwMEY15IU -BQJjPD4UAhsMAAoJEKtvwMEY15IU7cgQAM5f9bl3/X7NY2dZold2kW+oWMVLFvN6 -vTrF0MCneuNZtC+AwdYE/dNTBWwiBmzSUPK7W/lCuXLdBYC5ZkPmPPccucPIoGNX -vWbUo9gluYA/5oCl61a5r2HH9aoSCnMnoRrq8asHH4W/Yz3kXoawp/TsA876iGNk -t8mNwgiO9Du2J4LSSFCDeYhj2KYXKaOkRoB6T26kpZIhwS/q4RNKk0BttXWCqHQ3 -++l+4uS7TV/a4K79iQUpdU1qK58PCyP4iTRlT0Dm1tT53D6g1bo1CEAbWnzNKAEQ -J1vwy6waLK0udqZ/thcskapCvGa9As1G3uzJJsMdWu7nSoeYlUeZkzkkm98DIvIS -XOnqoxO18SQ6HTvO1J04R8iu245NfNlcPczeg/D+qXiV761fyHAlXABNRjkZj7qv -kqdr0netw4j6MNcT081xbaE3Br9uAQRio5/IMDYGNUtsqaR+q1QrFf+vFdrTL2Tx -BuBFwaqdRMB3J6hMsRN8K3L2YUkKYSewGM2FPBA2yZCrVCFiFxuAo0IVaay8aohQ -aHm0qBW6ZH3zaCJq+G8laXo/4ApoiHPh/mdE7QXurwdCSFJW/5ltpbYupSRduIxA -K1p4h13Mg9UlTTPYJySaGZrrz4IzbQ6VvC2HawD8AQaDXwzcaxwbX5zxR/dv/Xt3 -sPNV9V2sEQBi -=LKWP ------END PGP PUBLIC KEY BLOCK----- diff --git a/tmp/pgp.txt.gpg b/tmp/pgp.txt.gpg deleted file mode 100644 index a888590ec0c5c3349f831c78bc60bb8ce9e15831..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3223 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 JIP+ume*q*6QR4sr