From c48bf6a6d81c5de1dcb982b71de44864c52e4132 Mon Sep 17 00:00:00 2001
From: Shadow15510 <antoine.royer14@orange.fr>
Date: Thu, 23 Mar 2023 15:03:52 +0100
Subject: [PATCH] Update src and makefile to make the build process cleaner

---
 makefile         | 11 ++++++-----
 src/callbacks.c  |  6 +++---
 src/colors.c     |  2 +-
 src/main.c       |  3 ++-
 src/netcdf_api.c |  4 ++--
 src/sdl_api.c    |  4 ++--
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/makefile b/makefile
index 4d86e4a..335d40e 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,12 @@
 CC=gcc
-CFLAGS=`pkg-config --cflags gtk+-3.0` `pkg-config --cflags sdl2 SDL2_image SDL2_ttf`
+CFLAGS=-I. `pkg-config --cflags gtk+-3.0` `pkg-config --cflags sdl2 SDL2_image SDL2_ttf`
 LDFLAGS=`pkg-config --libs gtk+-3.0` `pkg-config --libs sdl2 SDL2_image SDL2_ttf` -rdynamic -lnetcdf -lm
 
 EXEC=ceilometer
 SRC=src/main.c src/callbacks.c src/netcdf_api.c src/sdl_api.c src/colors.c
-OBJ=$(SRC:.c=.o)
+OBJ=$(SRC:%.c=build/%.o)
 
-all: $(EXEC) clean
+all: $(EXEC)
 
 # Compilation Linux
 $(EXEC): $(OBJ)
@@ -14,12 +14,13 @@ $(EXEC): $(OBJ)
 
 main.o : include/main.h
 
-%.o: %.c
+build/%.o: %.c
+	@mkdir -p $(dir $@)
 	$(CC) -o $@ -c $< $(CFLAGS)
 
 # Nettoyage des sources
 clean:
-	rm src/*.o
+	rm -rf build	
 
 clear:
 	sudo rm -r /usr/bin/ceilometer_data
diff --git a/src/callbacks.c b/src/callbacks.c
index 2f7e9e2..07688cf 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -6,9 +6,9 @@
 #include <time.h>
 
 
-#include "../include/callbacks.h"
-#include "../include/netcdf_api.h"
-#include "../include/sdl_api.h"
+#include "include/callbacks.h"
+#include "include/netcdf_api.h"
+#include "include/sdl_api.h"
 
 
 extern GtkBuilder *builder;
diff --git a/src/colors.c b/src/colors.c
index 656233f..94c6ab6 100644
--- a/src/colors.c
+++ b/src/colors.c
@@ -1,4 +1,4 @@
-#include "../include/colors.h"
+#include "include/colors.h"
 
 const uint8_t COLORS[1020][3] = {
 {255, 0, 0},
diff --git a/src/main.c b/src/main.c
index 3a56b03..118fb3f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <gtk/gtk.h>
-#include "../include/callbacks.h"
+#include "include/main.h"
+#include "include/callbacks.h"
 
 GtkBuilder *builder;
 
diff --git a/src/netcdf_api.c b/src/netcdf_api.c
index 4f643bf..d6dddf7 100644
--- a/src/netcdf_api.c
+++ b/src/netcdf_api.c
@@ -6,8 +6,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "../include/netcdf_api.h"
-#include "../include/sdl_api.h"
+#include "include/netcdf_api.h"
+#include "include/sdl_api.h"
 
 
 extern GtkBuilder *builder;
diff --git a/src/sdl_api.c b/src/sdl_api.c
index 42a8447..5c3fc92 100644
--- a/src/sdl_api.c
+++ b/src/sdl_api.c
@@ -3,8 +3,8 @@
 #include <math.h>
 #include <SDL2/SDL_image.h>
 
-#include "../include/sdl_api.h"
-#include "../include/colors.h"
+#include "include/sdl_api.h"
+#include "include/colors.h"
 
 
 void sdl_image(float *data, float *alt, float minimum, float maximum, const bool filter, const char *var, char *date, const size_t NTIME, const size_t NRANGE)