4 Commits

Author SHA1 Message Date
89fa626950 Actualiser Makefile 2025-06-12 15:02:44 +00:00
1c27cff112 Actualiser global.mk 2025-06-12 15:00:02 +00:00
c81ac1ec53 Actualiser .gitmodules 2025-06-12 14:54:36 +00:00
a2b7a11b84 moved sumalib to v1.0.36 2020-04-13 14:08:16 +02:00
5 changed files with 10 additions and 11 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "sumalibs"] [submodule "sumalibs"]
path = sumalibs path = sumalibs
url = https://git.metabarcoding.org/obitools/sumalibs.git url = https://forge.metabarcoding.org/obitools/sumalibs.git

View File

@ -6,7 +6,7 @@ EXEC = sumatra
SUMATRA_SRC = sumatra.c \ SUMATRA_SRC = sumatra.c \
mtcompare_sumatra.c mtcompare_sumatra.c
SUMATRA_OBJ = $(patsubst %.c,%.o,$(SUMATRA_SRC)) SUMATRA_OBJ = $(patsubst %.c,%.o,$(SUMATRA_SRC))
SRCS = $(SUMATRA_SRC) SRCS = $(SUMATRA_SRC)
@ -26,9 +26,9 @@ all: $(EXEC)
# executable compilation and link # executable compilation and link
sumatra: $(SUMATRA_OBJ) sumatra: $(SUMATRA_OBJ) ./sumalibs/libsuma.a
$(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB) $(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB)
######## ########
# #
# project management # project management
@ -36,10 +36,10 @@ sumatra: $(SUMATRA_OBJ)
######## ########
clean: clean:
rm -f $(SUMATRA_OBJ) rm -f $(SUMATRA_OBJ)
rm -f $(EXEC) rm -f $(EXEC)
$(MAKE) -C ./sumalibs clean $(MAKE) -C ./sumalibs clean
install: all install: all
install -d $(DESTDIR)$(PREFIX)/bin/ install -d $(DESTDIR)$(PREFIX)/bin/
install -m 755 $(EXEC) $(DESTDIR)$(PREFIX)/bin/ install -m 755 $(EXEC) $(DESTDIR)$(PREFIX)/bin/

View File

@ -1,4 +1,3 @@
LIBSUMAPATH = -L./sumalibs LIBSUMAPATH = -L./sumalibs
LIBSUMA = ./sumalibs/libsuma.a LIBSUMA = ./sumalibs/libsuma.a
@ -8,9 +7,9 @@ LDFLAGS=
ifeq ($(CC),gcc) ifeq ($(CC),gcc)
CFLAGS = -O3 -s -DOMP_SUPPORT -w CFLAGS = -I sumalibs -O3 -s -DOMP_SUPPORT -w
else else
CFLAGS = -O3 -w CFLAGS = -I sumalibs -O3 -w
endif endif

View File

@ -20,7 +20,7 @@
#include "libutils/utilities.h" #include "libutils/utilities.h"
#include "mtcompare_sumatra.h" #include "mtcompare_sumatra.h"
#define VERSION "1.0.34" #define VERSION "1.0.36"
/* ----------------------------------------------- */ /* ----------------------------------------------- */