You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
121 lines
6.1 KiB
121 lines
6.1 KiB
13 years ago
|
--- a/Makefile
|
||
|
+++ b/Makefile
|
||
4 years ago
|
@@ -1,5 +1,8 @@
|
||
13 years ago
|
all:
|
||
|
- (cd src; $(MAKE))
|
||
|
+ $(MAKE) -C src
|
||
|
clean:
|
||
|
rm -f chaos anchors order glocal utils/bin2bl mlagan utils/cstat utils/bin2mf utils/rc *~ utils/contigorder utils/getbounds utils/cextract utils/seqmerge utils/getlength utils/getoverlap utils/*~ utils/scorealign utils/scorecontigs mlagan.purify utils/getcontigpos utils/fa2xfa utils/Glue utils/dotplot utils/overlay
|
||
4 years ago
|
- (cd src; $(MAKE) clean)
|
||
|
+ $(MAKE) -C src clean
|
||
|
+
|
||
|
+check: all
|
||
|
+ (LAGAN_DIR="." ./mlagan -h || true) | grep -q version && echo "[ok]" || echo "[fail]"
|
||
|
--- a/src/glocal/Makefile
|
||
|
+++ b/src/glocal/Makefile
|
||
|
@@ -1,19 +1,13 @@
|
||
|
-CC = g++
|
||
|
-OPTFLAGS =
|
||
|
-CFLAGS = $(OPTFLAGS) -O3
|
||
|
-CLINKER = g++
|
||
|
-# LIBDIR = -L/usr/local/lib
|
||
|
+CXXFLAGS += -Wno-deprecated
|
||
|
+CPPFLAGS += -I./
|
||
|
+
|
||
|
MLIB = -lm
|
||
|
-INCDIR = -I./
|
||
|
TRGT_DIR = ../..
|
||
|
TRGT = glocal
|
||
|
OBJECTS = glocal.o io.o rightinfluence.o leftinfluence.o score.o
|
||
|
|
||
|
-.cpp.o:
|
||
|
- $(CC) -Wno-deprecated $(CFLAGS) $(INCDIR) -c $*.cpp
|
||
|
-
|
||
|
$(TRGT): $(OBJECTS)
|
||
|
- $(CLINKER) $(OPTFLAGS) $(OBJECTS) -o $(TRGT_DIR)/$(TRGT) $(MLIB)
|
||
|
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) -o $(TRGT_DIR)/$(TRGT) $(MLIB)
|
||
|
|
||
|
clean :
|
||
|
rm -f *.o ./*~ *~ core
|
||
13 years ago
|
--- a/src/Makefile
|
||
|
+++ b/src/Makefile
|
||
4 years ago
|
@@ -1,54 +1,51 @@
|
||
|
-CC = gcc $(CFLAGS)
|
||
|
-CPP = g++ $(CFLAGS)
|
||
|
-CFLAGS = -O3 # -Wall -W
|
||
13 years ago
|
TRGT_DIR = ..
|
||
|
|
||
|
all: ../anchors ../chaos ../order ../mlagan ../prolagan ../utils/bin2mf ../utils/bin2bl ../utils/cextract ../utils/cstat ../utils/contigorder ../utils/getbounds ../utils/getlength ../utils/getoverlap ../utils/rc ../utils/seqmerge ../utils/scorealign ../utils/scorecontigs ../utils/getcontigpos ../utils/fa2xfa ../utils/Glue ../utils/dotplot ../utils/overlay
|
||
|
- (cd glocal; $(MAKE))
|
||
4 years ago
|
+ (cd glocal && $(MAKE))
|
||
13 years ago
|
clean:
|
||
|
rm -f *.o *~ utils/*~ mlagan.purify core
|
||
4 years ago
|
- (cd glocal; $(MAKE) clean)
|
||
|
+ (cd glocal && $(MAKE) clean)
|
||
13 years ago
|
../anchors: anchors.c skiplist.c
|
||
|
- $(CC) -o $(TRGT_DIR)/anchors anchors.c skiplist.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/anchors anchors.c skiplist.c
|
||
13 years ago
|
../chaos: fchaos.c thrtrie.c skiplist.c global.c translate.c mempage.c filebuffer.c
|
||
|
- $(CC) -o $(TRGT_DIR)/chaos fchaos.c thrtrie.c skiplist.c global.c translate.c filebuffer.c -lm -DCHAOS__FLAG
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/chaos fchaos.c thrtrie.c skiplist.c global.c translate.c filebuffer.c -lm -DCHAOS__FLAG
|
||
13 years ago
|
../order: order.c diagmatrix.c filebuffer.c
|
||
|
- $(CC) -o $(TRGT_DIR)/order order.c diagmatrix.c filebuffer.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/order order.c diagmatrix.c filebuffer.c
|
||
13 years ago
|
../mlagan: mlagan.c diagmatrix.c multial.c skiplist.c filebuffer.c
|
||
|
- $(CC) -o $(TRGT_DIR)/mlagan mlagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/mlagan mlagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG
|
||
13 years ago
|
../prolagan: prolagan.c diagmatrix.c multial.c skiplist.c filebuffer.c
|
||
|
- $(CC) -o $(TRGT_DIR)/prolagan prolagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/prolagan prolagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG
|
||
13 years ago
|
../utils/bin2mf: utils/bin2mf.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/bin2mf utils/bin2mf.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/bin2mf utils/bin2mf.c
|
||
13 years ago
|
../utils/bin2bl: utils/bin2bl.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/bin2bl utils/bin2bl.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/bin2bl utils/bin2bl.c
|
||
13 years ago
|
../utils/cextract: utils/cextract.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/cextract utils/cextract.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/cextract utils/cextract.c
|
||
13 years ago
|
../utils/cstat: utils/cstat.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/cstat utils/cstat.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/cstat utils/cstat.c
|
||
13 years ago
|
../utils/contigorder: utils/contigorder.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/contigorder utils/contigorder.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/contigorder utils/contigorder.c
|
||
13 years ago
|
../utils/getbounds: utils/getbounds.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/getbounds utils/getbounds.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/getbounds utils/getbounds.c
|
||
13 years ago
|
../utils/getcontigpos: utils/getcontigpos.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/getcontigpos utils/getcontigpos.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/getcontigpos utils/getcontigpos.c
|
||
13 years ago
|
../utils/getlength: utils/getlength.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/getlength utils/getlength.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/getlength utils/getlength.c
|
||
13 years ago
|
../utils/getoverlap: utils/getoverlap.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/getoverlap utils/getoverlap.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/getoverlap utils/getoverlap.c
|
||
13 years ago
|
../utils/rc: utils/rc.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/rc utils/rc.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/rc utils/rc.c
|
||
13 years ago
|
../utils/seqmerge: utils/seqmerge.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/seqmerge utils/seqmerge.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/seqmerge utils/seqmerge.c
|
||
13 years ago
|
../utils/scorealign: utils/scorealign.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/scorealign utils/scorealign.c -lm
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/scorealign utils/scorealign.c -lm
|
||
13 years ago
|
../utils/scorecontigs: utils/scorecontigs.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/scorecontigs utils/scorecontigs.c -lm
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/scorecontigs utils/scorecontigs.c -lm
|
||
13 years ago
|
../utils/fa2xfa: utils/fa2xfa.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/fa2xfa utils/fa2xfa.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/fa2xfa utils/fa2xfa.c
|
||
13 years ago
|
../utils/overlay: utils/overlay.c
|
||
|
- $(CC) -o $(TRGT_DIR)/utils/overlay utils/overlay.c
|
||
4 years ago
|
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/overlay utils/overlay.c
|
||
13 years ago
|
../utils/Glue: utils/Glue.cpp
|
||
|
- $(CPP) -o $(TRGT_DIR)/utils/Glue utils/Glue.cpp
|
||
4 years ago
|
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/Glue utils/Glue.cpp
|
||
13 years ago
|
../utils/dotplot: utils/dotplot.cpp
|
||
|
- $(CPP) -o $(TRGT_DIR)/utils/dotplot utils/dotplot.cpp
|
||
4 years ago
|
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(TRGT_DIR)/utils/dotplot utils/dotplot.cpp
|