diff --git a/Makefile b/Makefile index 9e83793..6560bcb 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,13 @@ -EXEC=sumaclust +EXEC = sumaclust -SUMACLUST_SRC= sumaclust.c \ - mtcompare_sumaclust.c +SUMACLUST_SRC = 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= -lfasta -llcs -lfile -lutils -lm #-ll - +LIB = -lsuma -lm #-ll include ./global.mk @@ -31,8 +28,8 @@ else LFLAGS = endif -sumaclust: $(SUMACLUST_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS) - $(CC) $(LDFLAGS) -o $@ $(LFLAGS) $(SUMACLUST_OBJ) $(LIB) $(LIBFASTAPATH) $(LIBLCSPATH) $(LIBFILEPATH) $(LIBUTILSPATH) +sumaclust: $(SUMACLUST_OBJ) $(LIBSUMA) + $(CC) $(LDFLAGS) -o $@ $(LFLAGS) $(SUMACLUST_OBJ) $(LIB) $(LIBSUMAPATH) ######## # @@ -41,12 +38,7 @@ sumaclust: $(SUMACLUST_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS) ######## clean: - rm -f *.o - rm -f *.P + rm -f $(SUMACLUST_OBJ) rm -f $(EXEC) - $(MAKE) -C ./sumalibs/libfasta clean - $(MAKE) -C ./sumalibs/liblcs clean - $(MAKE) -C ./sumalibs/libfile clean - $(MAKE) -C ./sumalibs/libutils clean - - + $(MAKE) -C ./sumalibs clean + diff --git a/global.mk b/global.mk index 9b7651f..577e8b6 100644 --- a/global.mk +++ b/global.mk @@ -1,13 +1,7 @@ -LIBFASTAPATH = -L./sumalibs/libfasta -LIBLCSPATH = -L./sumalibs/liblcs -LIBFILEPATH = -L./sumalibs/libfile -LIBUTILSPATH = -L./sumalibs/libutils +LIBSUMAPATH = -L./sumalibs -LIBFASTA = ./sumalibs/libfasta/libfasta.a -LIBLCS = ./sumalibs/liblcs/liblcs.a -LIBFILE = ./sumalibs/libfile/libfile.a -LIBUTILS = ./sumalibs/libutils/libutils.a +LIBSUMA = ./sumalibs/libsuma.a CC=gcc LDFLAGS= @@ -32,14 +26,5 @@ default: all # ######## -./sumalibs/libfasta/libfasta.a: - $(MAKE) -C ./sumalibs/libfasta - -./sumalibs/liblcs/liblcs.a: - $(MAKE) -C ./sumalibs/liblcs - -./sumalibs/libfile/libfile.a: - $(MAKE) -C ./sumalibs/libfile - -./sumalibs/libutils/libutils.a: - $(MAKE) -C ./sumalibs/libutils \ No newline at end of file +./sumalibs/libsuma.a: + $(MAKE) -C ./sumalibs diff --git a/sumaclust.c b/sumaclust.c index df0e778..c5e9d7c 100644 --- a/sumaclust.c +++ b/sumaclust.c @@ -23,7 +23,7 @@ #include "mtcompare_sumaclust.h" #include "sumaclust.h" -#define VERSION "1.0.31" +#define VERSION "1.0.32" /* ----------------------------------------------- */ diff --git a/sumalibs b/sumalibs index 0491294..ed56cb1 160000 --- a/sumalibs +++ b/sumalibs @@ -1 +1 @@ -Subproject commit 049129488ed96b03a5976512fe328dadeb72ace9 +Subproject commit ed56cb1d6b1e60a297cd0d1c67a4e17e4c59d202