X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile.mingw;h=9df4b9ad8166a66ff8545b0a4c7d9e908ecd60a6;hb=cd65d352809ab157b72524d8542e1ee66e5a09c6;hp=ffa1422043908dbb38ccae530166e176d7148925;hpb=70e923225f586027ab0954d23cb03a8ea0bfdbc5;p=samtools.git

diff --git a/Makefile.mingw b/Makefile.mingw
index ffa1422..9df4b9a 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,14 +1,14 @@
-#CC=			gcc
-#AR=			ar
-CC=			gccwine # on my laptop, this is an alias to [wine "c:/mingw/bin/gcc"]
-AR=			arwine
+CC=			gcc.exe
+AR=			ar.exe
 CFLAGS=		-g -Wall -O2
-DFLAGS=		-D_FILE_OFFSET_BITS=64 -D_CURSES_LIB=0 #-D_USE_KNETFILE
+DFLAGS=		-D_CURSES_LIB=2 -D_USE_KNETFILE
+KNETFILE_O=	knetfile.o
 LOBJS=		bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o	\
-			bam_pileup.o bam_lpileup.o bam_md.o glf.o razf.o faidx.o bam_sort.o
+			bam_pileup.o bam_lpileup.o bam_md.o glf.o razf.o faidx.o bam_sort.o \
+			$(KNETFILE_O)
 AOBJS=		bam_tview.o bam_maqcns.o bam_plcmd.o sam_view.o	\
 			bam_rmdup.o bam_rmdupse.o bam_mate.o bam_stat.o bam_color.o	\
-			bamtk.o
+			bamtk.o kaln.o sam_header.o
 PROG=		samtools
 INCLUDES=	-Iwin32
 SUBDIRS=	.
@@ -19,32 +19,24 @@ LIBPATH=
 .c.o:
 		$(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
 
-all-recur lib-recur clean-recur cleanlocal-recur install-recur:
-		@target=`echo $@ | sed s/-recur//`; \
-		wdir=`pwd`; \
-		list='$(SUBDIRS)'; for subdir in $$list; do \
-			cd $$subdir; \
-			$(MAKE) -f Makefile.mingw AR="$(AR)" CC="$(CC)" DFLAGS="$(DFLAGS)" CFLAGS="$(CFLAGS)" \
-				INCLUDES="$(INCLUDES)" LIBPATH="$(LIBPATH)" $$target || exit 1; \
-			cd $$wdir; \
-		done;
-
 all:$(PROG)
 
+.PHONY:all lib clean cleanlocal
+.PHONY:all-recur lib-recur clean-recur cleanlocal-recur install-recur
+
 lib:libbam.a
 
 libbam.a:$(LOBJS)
 		$(AR) -cru $@ $(LOBJS)
 
-### For the curses library: comment out `-lcurses' if you do not have curses installed
-samtools:lib $(AOBJS)
-		$(CC) $(CFLAGS) -o $@ $(AOBJS) $(LIBPATH) -lm -L. -lbam -Lwin32 -lz #-lcurses
+samtools:$(AOBJS) libbam.a
+		$(CC) $(CFLAGS) -o $@ $(AOBJS) $(LIBPATH) -lm -L. -lbam -Lwin32 -lz -lcurses -lws2_32
 
-razip:razip.o razf.o
-		$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
+razip:razip.o razf.o $(KNETFILE_O)
+		$(CC) $(CFLAGS) -o $@ razf.o razip.o $(KNETFILE_O) -lz
 
-bgzip:bgzip.o bgzf.o
-		$(CC) $(CFLAGS) -o $@ bgzf.o bgzip.o -lz
+bgzip:bgzip.o bgzf.o $(KNETFILE_O)
+		$(CC) $(CFLAGS) -o $@ bgzf.o bgzip.o $(KNETFILE_O) -lz
 
 razip.o:razf.h
 bam.o:bam.h razf.h bam_endian.h kstring.h
@@ -63,7 +55,5 @@ glf.o:glf.h
 faidx.o:faidx.h razf.h khash.h
 faidx_main.o:faidx.h razf.h
 
-cleanlocal:
-		rm -fr gmon.out *.o a.out *.dSYM razip $(PROG) *~ *.a
-
-clean:cleanlocal-recur
+clean:
+		rm -fr gmon.out *.o *.exe *.dSYM razip bgzip $(PROG) *~ *.a