diff --git a/Projet/CODE/apm/Makefile b/Projet/CODE/apm/Makefile index 84a6efe2f9017a381a0ca39ab483053bc0ff8a5b..0f3cf7cdfe216050d64f4ccdfcc3cae64fcd252a 100644 --- a/Projet/CODE/apm/Makefile +++ b/Projet/CODE/apm/Makefile @@ -1,25 +1,31 @@ -SRC_DIR=src -HEADER_DIR=include -OBJ_DIR=obj +SRCD=src +OBJD=obj +INCLUDED=include CC=gcc -CFLAGS=-O3 -I$(HEADER_DIR) +CFLAGS=-O3 -I $(INCLUDED) LDFLAGS= -SRC= apm.c +OBJ=$(OBJD)/apm.o -OBJ= $(OBJ_DIR)/apm.o +.PHONY: all +all: apm apm_omp apm_gpu -all: $(OBJ_DIR) apm +$(OBJD): + mkdir -p $(OBJD) -$(OBJ_DIR): - mkdir $(OBJ_DIR) - -$(OBJ_DIR)/%.o : $(SRC_DIR)/%.c +$(OBJD)/%.o: $(OBJD) $(SRCD)/%.c $(CC) $(CFLAGS) -c -o $@ $^ -apm:$(OBJ) +apm: apm.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ +apm_omp: + $(CC) $(CFLAGS) $(LDFLAGS) -p $@ $^ + +apm_gpu: + $(CC) $(CFLAGS) $(LDFLAGS) -p $@ $^ + +.PHHONY: clean clean: - rm -f apm $(OBJ) + rm -rf apm apm_omp apm_gpu $(OBJD) diff --git a/Projet/CODE/apm/src/apm_omp.c b/Projet/CODE/apm/src/apm_omp.c index 97fc31f8171ddf23eae8a487a5c6deaf9386ddec..f0d611a4ae3ee1f3646c622ba9f5241b3ec61a5f 100644 --- a/Projet/CODE/apm/src/apm_omp.c +++ b/Projet/CODE/apm/src/apm_omp.c @@ -1,7 +1,6 @@ /** * APPROXIMATE PATTERN MATCHING * - * INF560 X2016 */ #include <string.h> #include <stdio.h> @@ -50,7 +49,7 @@ read_input_file(char *filename, int *size) n_bytes = read(fd, buf, fsize); if (n_bytes != fsize) { - fprintf( stderr, + fprintf(stderr, "Unable to copy %lld byte(s) from text file (%d byte(s) copied)\n", fsize, n_bytes); return NULL; @@ -159,7 +158,6 @@ main(int argc, char **argv) } strncpy(pattern[i], argv[i + 3], (l + 1)); - }