Cleaner installation

Makefile

@@ -1,16 +1,17 @@
+PREFIX=/usr/local
+
+CFLAGS=-I$(PREFIX)/include
+
 EXEC = sumaclust
 
 SUMACLUST_SRC = sumaclust.c \
                 mtcompare_sumaclust.c
 
-             
 SUMACLUST_OBJ = $(patsubst %.c,%.o,$(SUMACLUST_SRC))
 
-
 SRCS = $(SUMACLUST_SRC)
 
-LIB= -lfasta -llcs -lfile -lutils -lm #-ll
+LIB = -lsuma -lm #-ll
-
 
 include ./global.mk
 
@@ -31,8 +32,8 @@ else
         LFLAGS = 
 endif
 
-sumaclust: $(SUMACLUST_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS)
+sumaclust: $(SUMACLUST_OBJ) $(LIBSUMA)
-	$(CC) $(LDFLAGS) -o $@ $(LFLAGS) $(SUMACLUST_OBJ) $(LIB) $(LIBFASTAPATH) $(LIBLCSPATH) $(LIBFILEPATH) $(LIBUTILSPATH)
+	$(CC) $(LDFLAGS) -o $@ $(LFLAGS) $(SUMACLUST_OBJ) $(LIB) $(LIBSUMAPATH)
 	
 ########
 #
@@ -41,12 +42,11 @@ sumaclust: $(SUMACLUST_OBJ) $(LIBFASTA) $(LIBLCS) $(LIBFILE) $(LIBUTILS)
 ########
 
 clean:
-	rm -f *.o	
+	rm -f $(SUMACLUST_OBJ)	
-	rm -f *.P
 	rm -f $(EXEC)
-	$(MAKE) -C ./sumalibs/libfasta clean
+	$(MAKE) -C ./sumalibs clean
-	$(MAKE) -C ./sumalibs/liblcs clean
-	$(MAKE) -C ./sumalibs/libfile clean
-	$(MAKE) -C ./sumalibs/libutils clean
 
+install: all
+	install -d $(DESTDIR)$(PREFIX)/bin/
+	install -m 755 $(EXEC) $(DESTDIR)$(PREFIX)/bin/
 

global.mk

@@ -1,13 +1,7 @@
 
-LIBFASTAPATH = -L./sumalibs/libfasta
+LIBSUMAPATH = -L./sumalibs
-LIBLCSPATH   = -L./sumalibs/liblcs
-LIBFILEPATH  = -L./sumalibs/libfile
-LIBUTILSPATH = -L./sumalibs/libutils
 
-LIBFASTA = ./sumalibs/libfasta/libfasta.a
+LIBSUMA = ./sumalibs/libsuma.a
-LIBLCS   = ./sumalibs/liblcs/liblcs.a
-LIBFILE  = ./sumalibs/libfile/libfile.a
-LIBUTILS = ./sumalibs/libutils/libutils.a
 
 CC=gcc
 LDFLAGS=
@@ -32,14 +26,5 @@ default: all
 #
 ########
 
-./sumalibs/libfasta/libfasta.a:
+./sumalibs/libsuma.a:
-	$(MAKE) -C ./sumalibs/libfasta
+	$(MAKE) -C ./sumalibs
-
-./sumalibs/liblcs/liblcs.a:
-	$(MAKE) -C ./sumalibs/liblcs
-
-./sumalibs/libfile/libfile.a:
-	$(MAKE) -C ./sumalibs/libfile
-
-./sumalibs/libutils/libutils.a:
-	$(MAKE) -C ./sumalibs/libutils

mtcompare_sumaclust.c

@@ -15,10 +15,10 @@
 #include <math.h>
 #include <sys/time.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"
 
 #include "sumaclust.h"
 

sumaclust.c

@@ -12,18 +12,18 @@
 #include <math.h>
 #include <sys/time.h>
 
-#include "./sumalibs/libutils/utilities.h"
+#include "libutils/utilities.h"
-#include "./sumalibs/libfasta/sequence.h"
+#include "libfasta/sequence.h"
-#include "./sumalibs/libfasta/fasta_header_parser.h"
+#include "libfasta/fasta_header_parser.h"
-#include "./sumalibs/libfasta/fasta_header_handler.h"
+#include "libfasta/fasta_header_handler.h"
-#include "./sumalibs/libfasta/fasta_seq_writer.h"
+#include "libfasta/fasta_seq_writer.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 "mtcompare_sumaclust.h"
 #include "sumaclust.h"
 
-#define VERSION "1.0.31"
+#define VERSION "1.0.33"
 
 
 /* ----------------------------------------------- */