diff --git a/jour4/Makefile b/jour4/Makefile deleted file mode 100644 index 2e76cf5..0000000 --- a/jour4/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -CC=gcc -CFLAGS= -Wall -g - -all: clean main clean - -main: main.o utils.o - $(CC) -o $@ $^ - -main.o: main.c - $(CC) $(CFLAGS) $^ -o $@ -c - -utils.o: utils.c - $(CC) $(CFLAGS) $^ -o $@ -c - -.PHONY: all clean - -clean: - rm -f *.o diff --git a/jour4/main.c b/jour4/main.c index 8348583..c5dbe41 100644 --- a/jour4/main.c +++ b/jour4/main.c @@ -4,24 +4,6 @@ #include "utils.h" -#define FILENAME "input" - -void premPartie(FILE *ptr); -void deuxPartie(FILE *ptr); - -int main() -{ - FILE *ptr = fopen(FILENAME, "r"); - if (ptr == NULL) - return 1; - - //premPartie(ptr); - deuxPartie(ptr); - - fclose(ptr); - return 0; -} - void deuxPartie(FILE *ptr) { int find = 0, tmp; diff --git a/jour4/utils.c b/lib/utils.c similarity index 100% rename from jour4/utils.c rename to lib/utils.c diff --git a/jour4/utils.h b/lib/utils.h similarity index 100% rename from jour4/utils.h rename to lib/utils.h diff --git a/make.sh b/make.sh index cde494e..91cb504 100755 --- a/make.sh +++ b/make.sh @@ -11,10 +11,12 @@ do done rm -f *.o turbo_main +echo "Compilation de la lib utils.c." +gcc -Wall -g lib/utils.c -o utils.o -c echo "Compilation de turbo_main.c." gcc -Wall -g turbo_main.c -o turbo_main.o -c echo "Compilation du jour $jour." -gcc -Wall -g jour$jour/main.c -o tmp.o -c -gcc -o turbo_main tmp.o turbo_main.o +gcc -Wall -g jour$jour/main.c -o tmp.o -c -Ilib +gcc -o turbo_main tmp.o turbo_main.o utils.o rm -f *.o cp jour$jour/input input