From ece23d11f2e168f22d5ebb685f73bda010122deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Math=C3=A9o=20Hersan?=
 <matheohersan@MacBook-Pro-de-Matheo.local>
Date: Mon, 16 Oct 2023 22:41:51 +0200
Subject: [PATCH] resolved conficts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mathéo Hersan <matheohersan@MacBook-Pro-de-Matheo.local>
---
 app                                           | Bin 0 -> 33488 bytes
 build.sh                                      |  15 +++---
 makefile                                      |  50 +++++-------------
 src/app/interface/client/interface_client.c   |   2 -
 .../interface_client.h => interface_client.c} |   7 ++-
 src/app/interface/interface_client.h          |   3 ++
 src/app/interface/interface_resp.c            |   1 +
 src/app/interface/{resp => }/interface_resp.h |   0
 src/app/interface/resp/interface_resp.c       |   1 -
 src/main.c                                    |   7 +--
 10 files changed, 33 insertions(+), 53 deletions(-)
 create mode 100755 app
 delete mode 100644 src/app/interface/client/interface_client.c
 rename src/app/interface/{client/interface_client.h => interface_client.c} (74%)
 create mode 100644 src/app/interface/interface_client.h
 create mode 100644 src/app/interface/interface_resp.c
 rename src/app/interface/{resp => }/interface_resp.h (100%)
 delete mode 100644 src/app/interface/resp/interface_resp.c

diff --git a/app b/app
new file mode 100755
index 0000000000000000000000000000000000000000..41458aedae7281c655a582d46f75879c25366930
GIT binary patch
literal 33488
zcmeI5YfM~46vu~MD9=**h^@AUTR#v~x@c{clwubwwvDwQ#YpO7x-56$D(r6dp-{FF
zq;14U!nPQVX=0mJEb)<QFxf9gOcPD~VllNQrYecCi7{0%8ri0Z=ghqecNeuLe(0C~
zA!ld)^Emg+?+zd5&S#e|{aGYLmLPMGFD2Kqg*YfQstIvD`F3(C8*8`K@2PKU;MR0g
zlhd0PD30?i4V1FEzNI<6Tg`W;w+Tz<P%}HFq)f_)-W{<76`Aoi+-)xAs5OK&uWQb-
zMc-VVDpH0c(bn)>Q)axgRy<;)jI}*po)s_EFQqpe2^s!&YkX$B3s$^Ot$x;av&ZIk
zDWm?U41b$6{JwzF>HJP@G1uE-1!0{T!|GB6zlT@IrQBNETr2Ns*tOey8*Xb8P^m1V
zbW$TbzpD~*Dcb|K*YJ<=@@T9ww>jTZVi8sB`(}Qh?cA~JzWS{@QhTH?BQMfyXRSqY
z411gnLiBNd{FXbYxWm#Nq<J6nv{mE@(rQoj3sFV7ki3!HZuT|X+wJw~zQ5;POoKFX
z-WQe8aHz7=XsvAP>1-p-wwj#t=z0HK`E$!Rwv1l<<(+$vS7ooKHjUg|6Gtglb<RcP
z{^7iZ3bj7gWaYFzwVsT9#Lwk*ai58*ivEqV=5wKZcK3uMdY7xtMR^&mG?1)}oa3MF
z6N2B}&6Z|fY&Vi~zni!XnMrap3<N*`1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;
zKmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l
z;2IK`JtHP&dL5%P10qgo42fWMe6mm^*9tMLbT{c-k)*StrXH`3-$3=rTz8VrqYh6N
zx|7$X`m#62j}4SgFH7lFHSr~>`gl#8&an<38<5ilRL=C)jncE@<4$>gruW0q8K;PU
zJv;j{9f56{>HX*wx6|3w(<KgfQaDP_7l?J~rWJ@-Osfm{9}h%B+FC6ZTQDSj!hcgL
z>H|?-domF1)c38UBCPp5Mo8DTX!&!0^k^QLf4jCxtM&N|Z-*YzI(02{X4LBm8j)zH
zCt~=twx|~L_zgYeQZv;o^E~hx>z&(6KHJM@+}%{N^Z9f(xB8v`;q${qbpE%*I$2Co
z9e=h)^jRee5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH
z0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sHfonuS
zqvtk~w~+Id-u7#~?H>u?yTntb>TbHl-JNQ&<~l4bgCWBo@y+#SNwJaz_dCT{jD8aP
zsVciVq~5K2qY+(p=$<w`B=SAx*Ab+*)6o49vAD})_yv6-f@~~yK&8iFmSpiw<mPkf
zdlID0Zz1pizQ>$(g1(2qx`Lcat}092?XJ<y^$RnQ85u~GLFSS;(B*H6#wqL&Ra3E7
zP#dL}6%!7k=TIwtg!&mTTfPweZq1>thBsUO{r9NVo#hDzMPBm4^0J58OI{n<d0Wq#
z)m?kLUf&cNyqI(4u9XiC`}gd9`{}pdYYBY(gKs?h%ZZ6691Sfwv$3(*zJp(V@cj0{
ziZ`y-Uwa}^e5=>z32t;<sp&7@w)Cd&dIKHBQzQ59|NYm)C!4<g;>SZ%FZrCuD;C}P
zo43?AwYV^G?xz!<Km5$(_lF&0m#!B7|MrJpJvn?JG_wAa>V&K3UH_rYFFtl;*$b}0
O6>t9Bf23^e(Z2w<Nt-7C

literal 0
HcmV?d00001

diff --git a/build.sh b/build.sh
index 43d8a2c..5797bd4 100755
--- a/build.sh
+++ b/build.sh
@@ -2,10 +2,11 @@
 
 SCRIPT_NAME=$(basename "$0")
 BUILD_DIR="build"
-OBJ_DIR="obj"
 SRC_DIR="src"
-APP_NAME="APP"
-GCC_OPTIONS="-c -O3"
+APP_NAME="app"
+GCC_OPTIONS="-Wall -Wextra -I $SRC_DIR -Wno-unused-parameter -Wno-unused-but-set-variable"
+GREEN='\033[0;32m'
+RESET='\033[0m'
 
 # Display functions
 function show_success {
@@ -41,7 +42,7 @@ fi
 
 # Clean generated files
 function clean {
-    local command="rm -rf $OBJ_DIR $BUILD_DIR"
+    local command="rm -r $BUILD_DIR $APP_NAME"
     echo -e "➔ Cleaning..."
     show_command "$command"
     make clean > /dev/null || show_error "Error during cleaning."
@@ -50,7 +51,7 @@ function clean {
 
 # Build
 function build {
-    local command="gcc $GCC_OPTIONS -o $OBJ_DIR/main.o $SRC_DIR/main.c"
+    local command="make"
     echo -e "➔ Building..."
     show_command "$command"
     make > /dev/null || show_error "Error during compilation."
@@ -59,7 +60,7 @@ function build {
 
 # Execute the executable
 function execute {
-    local executable="$BUILD_DIR/$APP_NAME"
+    local executable="$APP_NAME"
     local command="./$executable"
     echo -e "➔ Executing the executable..."
     show_command "$command"
@@ -118,4 +119,4 @@ while [ "$#" -gt 0 ]; do
             ;;
     esac
     shift
-done
+done
\ No newline at end of file
diff --git a/makefile b/makefile
index 6de9008..67fa35b 100644
--- a/makefile
+++ b/makefile
@@ -1,43 +1,21 @@
-CC = gcc
-SRC_DIR = src
-OBJ_DIR = obj
-SOURCES = $(wildcard $(SRC_DIR)/*.c)
-OBJECTS = $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(SOURCES))
-EXECUTABLE = APP
+GCCFLAGS = -Wall -Wextra -I src -Wno-unused-parameter -Wno-unused-but-set-variable
 BUILD_DIR = build
-LDFLAGS =
-CFLAGS_RELEASE = -O3
-CFLAGS_DEBUG = -g -O0
+SOURCES = $(shell find src -name '*.c')
+TARGETS = $(patsubst %.c, %.o, $(SOURCES))
+TARGETS := $(addprefix $(BUILD_DIR)/, $(TARGETS))
+APP_NAME = app
 
-# Generate dependency files
-DEPS = $(OBJECTS:.o=.d)
--include $(DEPS)
+all: $(APP_NAME)
 
-# Commands
-all: build
+$(APP_NAME): $(TARGETS)
+	@gcc $(GCCFLAGS) -o $(APP_NAME) $(TARGETS)
+	@echo -e $(GREEN)build done.$(RESET)
 
-build: $(BUILD_DIR)/$(EXECUTABLE)
+$(TARGETS): $(SOURCES)
+	@mkdir -p $(@D)
+	@gcc $(GCCFLAGS) -c $(patsubst %.o, %.c, $(@:$(BUILD_DIR)/%=%)) -o $@
 
-$(BUILD_DIR)/$(EXECUTABLE): $(OBJECTS)
-	@mkdir -p $(BUILD_DIR)
-	$(CC) $(LDFLAGS) -o $@ $^
-
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
-	@mkdir -p $(OBJ_DIR)
-	$(CC) -c $(CFLAGS_RELEASE) -MMD -MP -o $@ $<
-
-debug:
-	$(MAKE) CFLAGS_RELEASE="$(CFLAGS_DEBUG)" build
 
 clean:
-	rm -rf $(OBJ_DIR) $(BUILD_DIR)
-
-run: build
-	$<
-
-doc_doxygen:
-	@echo "Doxygen build started"
-	@$(MAKE) -C docs
-
-.PHONY: all build debug clean run doc_doxygen
-
+	@rm -r $(BUILD_DIR) $(APP_NAME)
+	@echo -e $(GREEN)clean done.$(RESET)
\ No newline at end of file
diff --git a/src/app/interface/client/interface_client.c b/src/app/interface/client/interface_client.c
deleted file mode 100644
index 5398fcf..0000000
--- a/src/app/interface/client/interface_client.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "interface_client.h"
-
diff --git a/src/app/interface/client/interface_client.h b/src/app/interface/interface_client.c
similarity index 74%
rename from src/app/interface/client/interface_client.h
rename to src/app/interface/interface_client.c
index 89a5f92..74fffb7 100644
--- a/src/app/interface/client/interface_client.h
+++ b/src/app/interface/interface_client.c
@@ -1,7 +1,6 @@
-#include<stdio.h>
+#include "interface_client.h"
 
-void affiche_client()
-{
+void affiche_client(){
     printf("\n");
     printf("--------------- \n");
     printf("|| Bonjour ! ||\n") ;
@@ -9,6 +8,6 @@ void affiche_client()
     printf("\n");
     printf("-------------------------------------------------------------------\n");
     printf("|| Que voulez-vous faire ? \t \t \t \t \t || \n") ;
-    printf("||\t1 : Afficher le récapitulatif de votre panier. \t \t \t \t || \n") ;
+    printf("||\t1 : Afficher le récapitulatif du panier. \t \t || \n") ;
     printf("-------------------------------------------------------------------\n");
 }
\ No newline at end of file
diff --git a/src/app/interface/interface_client.h b/src/app/interface/interface_client.h
new file mode 100644
index 0000000..c7e8589
--- /dev/null
+++ b/src/app/interface/interface_client.h
@@ -0,0 +1,3 @@
+#include<stdio.h>
+
+void affiche_client();
\ No newline at end of file
diff --git a/src/app/interface/interface_resp.c b/src/app/interface/interface_resp.c
new file mode 100644
index 0000000..f1afd34
--- /dev/null
+++ b/src/app/interface/interface_resp.c
@@ -0,0 +1 @@
+#include "interface_resp.h"
diff --git a/src/app/interface/resp/interface_resp.h b/src/app/interface/interface_resp.h
similarity index 100%
rename from src/app/interface/resp/interface_resp.h
rename to src/app/interface/interface_resp.h
diff --git a/src/app/interface/resp/interface_resp.c b/src/app/interface/resp/interface_resp.c
deleted file mode 100644
index b62b362..0000000
--- a/src/app/interface/resp/interface_resp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "interface_resp.h"
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 78fcf98..5a5f8fd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,9 @@
 #include<stdio.h>
 #include<stdlib.h>
-#include "app/interface/client/interface_client.h"
-#include "app/interface/resp/interface_resp.h"
+#include "app/interface/interface_client.h"
+#include "app/interface/interface_resp.h"
 
 int main(){
-    printf("Hello World\n");
+
+    affiche_client();
 }