obitools/sumatra
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

version 1.0.32: compilation with libsuma

Browse Source
This commit is contained in:
Celine Mercier
2019-03-27 09:23:37 +01:00
parent 646bfd44d4
commit 294a31624c
4 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -1,14 +1,13 @@
EXEC=sumatra 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) LIB = -lsuma -lz -lm
LIB= -lfasta -llcs -lfile -lutils -lz -lm
include ./global.mk include ./global.mk
@ -23,8 +22,8 @@ all: $(EXEC)
# executable compilation and link # executable compilation and link
sumatra: $(SUMATRA_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS) sumatra: $(SUMATRA_OBJ) $(LIBSUMA)
$(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBFASTAPATH) $(LIBLCSPATH) $(LIBFILEPATH) $(LIBUTILSPATH) $(LIB) $(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB)
######## ########
# #
@ -33,12 +32,8 @@ sumatra: $(SUMATRA_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS)
######## ########
clean: clean:
rm -f *.o rm -f $(SUMATRA_OBJ)
rm -f *.P
rm -f $(EXEC) rm -f $(EXEC)
$(MAKE) -C ./sumalibs/libfasta clean $(MAKE) -C ./sumalibs clean
$(MAKE) -C ./sumalibs/liblcs clean
$(MAKE) -C ./sumalibs/libfile clean
$(MAKE) -C ./sumalibs/libutils clean

25
global.mk
View File

@ -1,20 +1,14 @@
LIBFASTAPATH = -L./sumalibs/libfasta LIBSUMAPATH = -L./sumalibs
LIBLCSPATH = -L./sumalibs/liblcs
LIBFILEPATH = -L./sumalibs/libfile
LIBUTILSPATH = -L./sumalibs/libutils
LIBFASTA = ./sumalibs/libfasta/libfasta.a LIBSUMA = ./sumalibs/libsuma.a
LIBLCS = ./sumalibs/liblcs/liblcs.a
LIBFILE = ./sumalibs/libfile/libfile.a
LIBUTILS = ./sumalibs/libutils/libutils.a
CC=gcc CC=gcc
LDFLAGS= LDFLAGS=
ifeq ($(CC),gcc) ifeq ($(CC),gcc)
CFLAGS = -O3 -s -DOMP_SUPPORT -fopenmp -w CFLAGS = -O3 -s -DOMP_SUPPORT -w
else else
CFLAGS = -O3 -w CFLAGS = -O3 -w
endif endif
@ -32,14 +26,5 @@ default: all
# #
######## ########
./sumalibs/libfasta/libfasta.a: ./sumalibs/libsuma.a:
$(MAKE) -C ./sumalibs/libfasta $(MAKE) -C ./sumalibs
./sumalibs/liblcs/liblcs.a:
$(MAKE) -C ./sumalibs/liblcs
./sumalibs/libfile/libfile.a:
$(MAKE) -C ./sumalibs/libfile
./sumalibs/libutils/libutils.a:
$(MAKE) -C ./sumalibs/libutils

2
sumalibs

Submodule sumalibs updated: 049129488e...ed56cb1d6b

2
sumatra.c
View File

@ -20,7 +20,7 @@
#include "./sumalibs/libutils/utilities.h" #include "./sumalibs/libutils/utilities.h"
#include "mtcompare_sumatra.h" #include "mtcompare_sumatra.h"
#define VERSION "1.0.31" #define VERSION "1.0.32"
/* ----------------------------------------------- */ /* ----------------------------------------------- */