From 8bd2c05d4863b2e26778f1ddcc25f1f3b27b4e71 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Thu, 16 Jul 2015 14:23:44 +0200 Subject: [PATCH] configuring the sumalibs submodule --- .gitmodules | 3 +++ Makefile | 8 ++++---- global.mk | 32 ++++++++++++++++---------------- sumalibs | 1 + 4 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 .gitmodules create mode 160000 sumalibs diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..399bb79 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "sumalibs"] + path = sumalibs + url = https://git.metabarcoding.org/obitools/sumalibs.git diff --git a/Makefile b/Makefile index 7894b27..8736691 100644 --- a/Makefile +++ b/Makefile @@ -36,9 +36,9 @@ clean: rm -f *.o rm -f *.P 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/libfasta clean + $(MAKE) -C ./sumalibs/liblcs clean + $(MAKE) -C ./sumalibs/libfile clean + $(MAKE) -C ./sumalibs/libutils clean diff --git a/global.mk b/global.mk index 503337a..9b7651f 100644 --- a/global.mk +++ b/global.mk @@ -1,13 +1,13 @@ -LIBFASTAPATH = -L../sumalibs/libfasta -LIBLCSPATH = -L../sumalibs/liblcs -LIBFILEPATH = -L../sumalibs/libfile -LIBUTILSPATH = -L../sumalibs/libutils +LIBFASTAPATH = -L./sumalibs/libfasta +LIBLCSPATH = -L./sumalibs/liblcs +LIBFILEPATH = -L./sumalibs/libfile +LIBUTILSPATH = -L./sumalibs/libutils -LIBFASTA = ../sumalibs/libfasta/libfasta.a -LIBLCS = ../sumalibs/liblcs/liblcs.a -LIBFILE = ../sumalibs/libfile/libfile.a -LIBUTILS = ../sumalibs/libutils/libutils.a +LIBFASTA = ./sumalibs/libfasta/libfasta.a +LIBLCS = ./sumalibs/liblcs/liblcs.a +LIBFILE = ./sumalibs/libfile/libfile.a +LIBUTILS = ./sumalibs/libutils/libutils.a CC=gcc LDFLAGS= @@ -32,14 +32,14 @@ default: all # ######## -../sumalibs/libfasta/libfasta.a: - $(MAKE) -C ../sumalibs/libfasta +./sumalibs/libfasta/libfasta.a: + $(MAKE) -C ./sumalibs/libfasta -../sumalibs/liblcs/liblcs.a: - $(MAKE) -C ../sumalibs/liblcs +./sumalibs/liblcs/liblcs.a: + $(MAKE) -C ./sumalibs/liblcs -../sumalibs/libfile/libfile.a: - $(MAKE) -C ../sumalibs/libfile +./sumalibs/libfile/libfile.a: + $(MAKE) -C ./sumalibs/libfile -../sumalibs/libutils/libutils.a: - $(MAKE) -C ../sumalibs/libutils \ No newline at end of file +./sumalibs/libutils/libutils.a: + $(MAKE) -C ./sumalibs/libutils \ No newline at end of file diff --git a/sumalibs b/sumalibs new file mode 160000 index 0000000..0491294 --- /dev/null +++ b/sumalibs @@ -0,0 +1 @@ +Subproject commit 049129488ed96b03a5976512fe328dadeb72ace9