X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=misc%2FMakefile;h=c8b89e6ac5991177941ff17bbc32af0b43c1a907;hb=4e0a2f896484bc0792e81b7036a17a3f4b15d2dd;hp=792cbbbeb67e335ba65f4f93b920a31b4133f632;hpb=115b2e9f98151f208207aae6286acd12adf019de;p=samtools.git

diff --git a/misc/Makefile b/misc/Makefile
index 792cbbb..c8b89e6 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,12 +1,11 @@
 CC=			gcc
 CXX=		g++
-CFLAGS=		-g -Wall -O2 -m64 #-arch ppc
+CFLAGS=		-g -Wall -O2 #-m64 #-arch ppc
 CXXFLAGS=	$(CFLAGS)
-DFLAGS=		#-D_FILE_OFFSET_BITS=64
+DFLAGS=		-D_FILE_OFFSET_BITS=64
 OBJS=		
-PROG=		faidx md5sum-lite md5fa maq2sam-short maq2sam-long wgsim fa2csfa
+PROG=		md5sum-lite md5fa maq2sam-short maq2sam-long ace2sam wgsim seqtk
 INCLUDES=	-I..
-LIBS=		-lm -lz
 SUBDIRS=	.
 
 .SUFFIXES:.c .o
@@ -21,21 +20,21 @@ lib-recur all-recur clean-recur cleanlocal-recur install-recur:
 		wdir=`pwd`; \
 		list='$(SUBDIRS)'; for subdir in $$list; do \
 			cd $$subdir; \
-			$(MAKE) CC="$(CC)" CXX="$(CXX)" DFLAGS="$(DFLAGS)" CFLAGS="$(CFLAGS)" \
+			$(MAKE) CC="$(CC)" DFLAGS="$(DFLAGS)" CFLAGS="$(CFLAGS)" \
 				INCLUDES="$(INCLUDES)" $$target || exit 1; \
 			cd $$wdir; \
 		done;
 
 lib:
 
-wgsim:wgsim.o
-		$(CC) $(CFLAGS) -o $@ wgsim.o -lm
+ace2sam:ace2sam.o
+		$(CC) $(CFLAGS) -o $@ ace2sam.o -lz
 
-faidx:../faidx.c ../faidx.h
-		$(CC) $(CFLAGS) -D_NO_RAZF -DFAIDX_MAIN -o $@ ../faidx.c
+seqtk:seqtk.o
+		$(CC) $(CFLAGS) -o $@ seqtk.o -lm -lz
 
-fa2csfa:fa2csfa.o
-		$(CC) $(CFLAGS) -o $@ fa2csfa.o -lz
+wgsim:wgsim.o
+		$(CC) $(CFLAGS) -o $@ wgsim.o -lm -lz
 
 md5fa:md5.o md5fa.o md5.h ../kseq.h
 		$(CC) $(CFLAGS) -o $@ md5.o md5fa.o -lz
@@ -46,8 +45,6 @@ md5sum-lite:md5sum-lite.o
 md5sum-lite.o:md5.c md5.h
 		$(CC) -c $(CFLAGS) -DMD5SUM_MAIN -o $@ md5.c
 
-fa2csfa:fa2csfa.c ../kseq.h
-
 maq2sam-short:maq2sam.c
 		$(CC) $(CFLAGS) -o $@ maq2sam.c -lz
 
@@ -57,7 +54,16 @@ maq2sam-long:maq2sam.c
 md5fa.o:md5.h md5fa.c
 		$(CC) $(CFLAGS) -c -I.. -o $@ md5fa.c
 
+seqtk.o:seqtk.c ../khash.h ../kseq.h
+		$(CC) $(CFLAGS) -c -I.. -o $@ seqtk.c
+
+wgsim.o:wgsim.c ../kseq.h
+		$(CC) $(CFLAGS) -c -I.. -o $@ wgsim.c
+
+ace2sam.o:ace2sam.c ../kstring.h ../kseq.h
+		$(CC) $(CFLAGS) -c -I.. -o $@ ace2sam.c
+
 cleanlocal:
-		rm -fr gmon.out *.o a.out *.dSYM $(PROG) *~ *.a
+		rm -fr gmon.out *.o a.out *.exe *.dSYM $(PROG) *~ *.a
 
 clean:cleanlocal-recur