From 2e432e83818ba261ab9d3a44a94692b8c88d6d05 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Wed, 27 Mar 2019 17:09:01 +0100 Subject: [PATCH] Cleaner installation --- Makefile | 10 +++++++++- mtcompare_sumaclust.c | 8 ++++---- sumaclust.c | 16 ++++++++-------- sumalibs | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 6560bcb..d2c579d 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +PREFIX=/usr/local + +CFLAGS=-I$(PREFIX)/include + EXEC = sumaclust SUMACLUST_SRC = sumaclust.c \ @@ -41,4 +45,8 @@ clean: rm -f $(SUMACLUST_OBJ) rm -f $(EXEC) $(MAKE) -C ./sumalibs clean - + +install: all + install -d $(DESTDIR)$(PREFIX)/bin/ + install -m 755 $(EXEC) $(DESTDIR)$(PREFIX)/bin/ + diff --git a/mtcompare_sumaclust.c b/mtcompare_sumaclust.c index da9e5ab..a5bcb44 100644 --- a/mtcompare_sumaclust.c +++ b/mtcompare_sumaclust.c @@ -15,10 +15,10 @@ #include #include -#include "./sumalibs/libfasta/sequence.h" -#include "./sumalibs/libutils/utilities.h" -#include "./sumalibs/liblcs/upperband.h" -#include "./sumalibs/liblcs/sse_banded_LCS_alignment.h" +#include "libfasta/sequence.h" +#include "libutils/utilities.h" +#include "liblcs/upperband.h" +#include "liblcs/sse_banded_LCS_alignment.h" #include "sumaclust.h" diff --git a/sumaclust.c b/sumaclust.c index c5e9d7c..cd36f3e 100644 --- a/sumaclust.c +++ b/sumaclust.c @@ -12,18 +12,18 @@ #include #include -#include "./sumalibs/libutils/utilities.h" -#include "./sumalibs/libfasta/sequence.h" -#include "./sumalibs/libfasta/fasta_header_parser.h" -#include "./sumalibs/libfasta/fasta_header_handler.h" -#include "./sumalibs/libfasta/fasta_seq_writer.h" -#include "./sumalibs/liblcs/upperband.h" -#include "./sumalibs/liblcs/sse_banded_LCS_alignment.h" +#include "libutils/utilities.h" +#include "libfasta/sequence.h" +#include "libfasta/fasta_header_parser.h" +#include "libfasta/fasta_header_handler.h" +#include "libfasta/fasta_seq_writer.h" +#include "liblcs/upperband.h" +#include "liblcs/sse_banded_LCS_alignment.h" #include "mtcompare_sumaclust.h" #include "sumaclust.h" -#define VERSION "1.0.32" +#define VERSION "1.0.33" /* ----------------------------------------------- */ diff --git a/sumalibs b/sumalibs index ed56cb1..b11748e 160000 --- a/sumalibs +++ b/sumalibs @@ -1 +1 @@ -Subproject commit ed56cb1d6b1e60a297cd0d1c67a4e17e4c59d202 +Subproject commit b11748eac8b2ff68388d44bcba577323cebe5b08