Updated Makefile to also make StxTyper

Makefile

@@ -81,11 +81,11 @@ CXX=g++
 COMPILE.cpp= $(CXX) $(CPPFLAGS) $(SVNREV) $(DBDIR) $(TEST_UPDATE_DB) -c 
 
 
-.PHONY: all clean install release 
+.PHONY: all clean install release stxtyper test
 
 BINARIES= amr_report amrfinder amrfinder_index amrfinder_update fasta_check fasta_extract fasta2parts gff_check dna_mutation mutate
 
-all:	$(BINARIES)
+all:	$(BINARIES) stxtyper
 
 release: clean
 	svnversion . > version.txt
@@ -151,18 +151,21 @@ mutateOBJS=mutate.o common.o alignment.o seq.o
 mutate:	$(mutateOBJS)
 	$(CXX) -o $@ $(mutateOBJS)
 
-
+stxtyper:
+		$(MAKE) -C stxtyper
 
 clean:
 	rm -f *.o
 	rm -f $(BINARIES)
+	$(MAKE) -C stxtyper clean
 
 install:
 	@if [ ! -e $(DESTDIR)$(bindir) ]; \
 	then \
 		mkdir -p $(DESTDIR)$(bindir); \
 	fi
 	$(INSTALL) $(BINARIES) $(DESTDIR)$(bindir)
+	make -C stxtyper install PREFIX=$(PREFIX) bindir=$(bindir)
 
 # amrfinder binaries for github binary release
 GITHUB_FILE=amrfinder_binaries_v$(VERSION_STRING)
@@ -187,3 +190,4 @@ github_binaries:
 
 test : $(DISTFILES) Makefile *.cpp *.hpp *.inc test_dna.fa test_prot.fa test_prot.gff test_dna.fa test_dna.expected test_prot.expected test_both.expected
 	./test_amrfinder.sh
+	make -C stxtyper test