Commit c4822c48 authored by Celine Mercier's avatar Celine Mercier

Cleaner installation

parent 294a3162
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) ...@@ -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: ...@@ -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/
...@@ -10,10 +10,10 @@ ...@@ -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 {
......
Subproject commit ed56cb1d6b1e60a297cd0d1c67a4e17e4c59d202 Subproject commit b11748eac8b2ff68388d44bcba577323cebe5b08
...@@ -14,13 +14,13 @@ ...@@ -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"
/* ----------------------------------------------- */ /* ----------------------------------------------- */
......
...@@ -8,7 +8,7 @@ ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment