version 1.0.32: compilation with libsuma

This commit is contained in:
Celine Mercier
2019-03-27 09:14:24 +01:00
parent 882ee2eaea
commit 8155592408
4 changed files with 17 additions and 40 deletions

View File

@ -1,16 +1,13 @@
EXEC=sumaclust EXEC = sumaclust
SUMACLUST_SRC= sumaclust.c \ SUMACLUST_SRC = sumaclust.c \
mtcompare_sumaclust.c mtcompare_sumaclust.c
SUMACLUST_OBJ = $(patsubst %.c,%.o,$(SUMACLUST_SRC))
SUMACLUST_OBJ= $(patsubst %.c,%.o,$(SUMACLUST_SRC))
SRCS = $(SUMACLUST_SRC)
SRCS= $(SUMACLUST_SRC) LIB = -lsuma -lm #-ll
LIB= -lfasta -llcs -lfile -lutils -lm #-ll
include ./global.mk include ./global.mk
@ -31,8 +28,8 @@ else
LFLAGS = LFLAGS =
endif endif
sumaclust: $(SUMACLUST_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS) sumaclust: $(SUMACLUST_OBJ) $(LIBSUMA)
$(CC) $(LDFLAGS) -o $@ $(LFLAGS) $(SUMACLUST_OBJ) $(LIB) $(LIBFASTAPATH) $(LIBLCSPATH) $(LIBFILEPATH) $(LIBUTILSPATH) $(CC) $(LDFLAGS) -o $@ $(LFLAGS) $(SUMACLUST_OBJ) $(LIB) $(LIBSUMAPATH)
######## ########
# #
@ -41,12 +38,7 @@ sumaclust: $(SUMACLUST_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS)
######## ########
clean: clean:
rm -f *.o rm -f $(SUMACLUST_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

View File

@ -1,13 +1,7 @@
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=
@ -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

View File

@ -23,7 +23,7 @@
#include "mtcompare_sumaclust.h" #include "mtcompare_sumaclust.h"
#include "sumaclust.h" #include "sumaclust.h"
#define VERSION "1.0.31" #define VERSION "1.0.32"
/* ----------------------------------------------- */ /* ----------------------------------------------- */