Skip to content

Commit

Permalink
Canonicalise whitespace -- USE -b/-w TO DIFF/BLAME ACROSS THIS COMMIT
Browse files Browse the repository at this point in the history
Expand tabs as spaces; hard tab characters are no longer to be used
as there is disagreement as to how many columns they should expand to.
Remove trailing whitespace at the end of lines.

After this commit, please do not commit hard tab characters or trailing
whitespace in .c, .h, .pl, or .txt files, and please consider using a
pre-commit hook in your local repository to enforce this.

These steps will minimise the incidental whitespace changes unrelated
to the intended commit changes that make viewing diffs and merging
less convenient.

To compare files prior to and after the whitespace discontinuity of
this commit, use "diff -b" or "diff -w", "blame -w", etc.

(This does not apply to kmin.[ch], which are in theory synchronised with
kmath.[ch] in the klib project, so minimising differences with copies of
this code elsewhere is more important.  Please avoid accidental incidental
whitespace changes in these files too.)
  • Loading branch information
jmarshall committed Aug 14, 2014
1 parent 33e3c1d commit 1ffc547
Show file tree
Hide file tree
Showing 41 changed files with 2,968 additions and 2,968 deletions.
38 changes: 19 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

PROG= bcftools
PROG= bcftools
TEST_PROG= test/test-rbuf


Expand All @@ -35,15 +35,15 @@ HTSLIB = $(HTSDIR)/libhts.a
BGZIP = $(HTSDIR)/bgzip
TABIX = $(HTSDIR)/tabix

CC= gcc
CFLAGS= -g -Wall -Wc++-compat -O2
DFLAGS=
OBJS= main.o vcfindex.o tabix.o \
vcfstats.o vcfisec.o vcfmerge.o vcfquery.o vcffilter.o filter.o vcfsom.o \
vcfnorm.o vcfgtcheck.o vcfview.o vcfannotate.o vcfroh.o vcfconcat.o \
vcfcall.o mcall.o vcmp.o gvcf.o reheader.o \
ccall.o em.o prob1.o kmin.o # the original samtools calling
INCLUDES= -I. -I$(HTSDIR)
CC = gcc
CFLAGS = -g -Wall -Wc++-compat -O2
DFLAGS =
OBJS = main.o vcfindex.o tabix.o \
vcfstats.o vcfisec.o vcfmerge.o vcfquery.o vcffilter.o filter.o vcfsom.o \
vcfnorm.o vcfgtcheck.o vcfview.o vcfannotate.o vcfroh.o vcfconcat.o \
vcfcall.o mcall.o vcmp.o gvcf.o reheader.o \
ccall.o em.o prob1.o kmin.o # the original samtools calling
INCLUDES = -I. -I$(HTSDIR)

prefix = /usr/local
exec_prefix = $(prefix)
Expand Down Expand Up @@ -74,10 +74,10 @@ version.h:
force:

.c.o:
$(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
$(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@

test: $(PROG) plugins test/test-rbuf $(BGZIP) $(TABIX)
./test/test.pl --exec bgzip=$(BGZIP) --exec tabix=$(TABIX)
./test/test.pl --exec bgzip=$(BGZIP) --exec tabix=$(TABIX)

PLUGINC = $(foreach dir, plugins, $(wildcard $(dir)/*.c))
PLUGINS = $(PLUGINC:.c=.so)
Expand Down Expand Up @@ -121,23 +121,23 @@ vcmp.o: vcmp.c $(htslib_hts_h) vcmp.h
test/test-rbuf.o: test/test-rbuf.c rbuf.h

test/test-rbuf: test/test-rbuf.o
$(CC) $(CFLAGS) -o $@ -lm -ldl $<
$(CC) $(CFLAGS) -o $@ -lm -ldl $<

bcftools: $(HTSLIB) $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(HTSLIB) -lpthread -lz -lm -ldl
$(CC) $(CFLAGS) -o $@ $(OBJS) $(HTSLIB) -lpthread -lz -lm -ldl

bcftools.1: bcftools.txt
a2x --doctype manpage --format manpage bcftools.txt
a2x --doctype manpage --format manpage bcftools.txt

bcftools.html: bcftools.txt
a2x --doctype manpage --format xhtml bcftools.txt
a2x --doctype manpage --format xhtml bcftools.txt

docs: bcftools.html bcftools.1

install: $(PROG)
mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
$(INSTALL_PROGRAM) $(PROG) plot-vcfstats vcfutils.pl $(DESTDIR)$(bindir)
$(INSTALL_DATA) bcftools.1 $(DESTDIR)$(man1dir)
mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
$(INSTALL_PROGRAM) $(PROG) plot-vcfstats vcfutils.pl $(DESTDIR)$(bindir)
$(INSTALL_DATA) bcftools.1 $(DESTDIR)$(man1dir)

clean: testclean
-rm -f gmon.out *.o *~ $(PROG) version.h plugins/*.so
Expand Down
Loading

0 comments on commit 1ffc547

Please sign in to comment.