Modif makefile to go in subdir src/

Makefile

@@ -2,14 +2,22 @@ CC=gcc
 CFLAGS=-c -Wall -g -O3
 LDFLAGS=-lm
 SRC_DIR=src
+<<<<<<< HEAD
 SOURCES=$(shell find $(SRC_DIR) -name '*.c')
+=======
+SOURCES=$(shell find $(SRC_DIR) -name "*.c")
+>>>>>>> Modif makefile to go in subdir src/
 OBJECTS=$(SOURCES:.c=.o)
 BINARY=INTBuilder
 
 all: $(BINARY)
 
 $(BINARY): $(OBJECTS)
+<<<<<<< HEAD
 	$(CC) $^ -o $@ $(LDFLAGS)
+=======
+	$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
+>>>>>>> Modif makefile to go in subdir src/
 
 %.o: %.c
 	$(CC) $(CFLAGS) $< -o $@