Cleaner installation

This commit is contained in:
Celine Mercier
2019-03-27 17:09:31 +01:00
parent 294a31624c
commit c4822c4874
5 changed files with 19 additions and 13 deletions

View File

@ -1,3 +1,7 @@
PREFIX=/usr/local
CFLAGS=-I$(PREFIX)/include
EXEC = sumatra EXEC = sumatra
SUMATRA_SRC = sumatra.c \ SUMATRA_SRC = sumatra.c \
@ -22,7 +26,7 @@ all: $(EXEC)
# executable compilation and link # executable compilation and link
sumatra: $(SUMATRA_OBJ) $(LIBSUMA) sumatra: $(SUMATRA_OBJ)
$(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB) $(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB)
######## ########
@ -36,4 +40,6 @@ clean:
rm -f $(EXEC) rm -f $(EXEC)
$(MAKE) -C ./sumalibs clean $(MAKE) -C ./sumalibs clean
install: all
install -d $(DESTDIR)$(PREFIX)/bin/
install -m 755 $(EXEC) $(DESTDIR)$(PREFIX)/bin/

View File

@ -10,10 +10,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "sumatra.h" #include "sumatra.h"
#include "./sumalibs/libfasta/sequence.h" #include "libfasta/sequence.h"
#include "./sumalibs/libutils/utilities.h" #include "libutils/utilities.h"
#include "./sumalibs/liblcs/upperband.h" #include "liblcs/upperband.h"
#include "./sumalibs/liblcs/sse_banded_LCS_alignment.h" #include "liblcs/sse_banded_LCS_alignment.h"
typedef struct { typedef struct {

View File

@ -14,13 +14,13 @@
#include <sys/time.h> #include <sys/time.h>
#include "./sumalibs/libfasta/sequence.h" #include "libfasta/sequence.h"
#include "./sumalibs/liblcs/upperband.h" #include "liblcs/upperband.h"
#include "./sumalibs/liblcs/sse_banded_LCS_alignment.h" #include "liblcs/sse_banded_LCS_alignment.h"
#include "./sumalibs/libutils/utilities.h" #include "libutils/utilities.h"
#include "mtcompare_sumatra.h" #include "mtcompare_sumatra.h"
#define VERSION "1.0.32" #define VERSION "1.0.33"
/* ----------------------------------------------- */ /* ----------------------------------------------- */

View File

@ -8,7 +8,7 @@
#ifndef SUMATRA_H_ #ifndef SUMATRA_H_
#define SUMATRA_H_ #define SUMATRA_H_
#include "./sumalibs/libfasta/sequence.h" #include "libfasta/sequence.h"
void printResults(fastaSeqPtr seq1, fastaSeqPtr seq2, double score, BOOL extradata, int64_t pairs, BOOL print); void printResults(fastaSeqPtr seq1, fastaSeqPtr seq2, double score, BOOL extradata, int64_t pairs, BOOL print);