Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GNU autotools based build #8

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# http://www.gnu.org/software/autoconf

/autom4te.cache
/aclocal.m4
/compile
/configure
/depcomp
/install-sh
/missing
/stamp-h1
/test-driver
/INSTALL

# http://www.gnu.org/software/automake

Makefile.in

# autoscan

/autoscan.log
/configure.scan
/config.h.in

# configure

Makefile
/config.h
/config.log
/config.status
.deps

# make

*.o
rapsearch
prerapsearch

# other

*~
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SUBDIRS = Src
7 changes: 1 addition & 6 deletions Src/HashSearch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
#include <boost/serialization/vector.hpp>
#include <boost/bind.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/chrono/thread_clock.hpp>
#include "threadpool.hpp"
#include <boost/threadpool.hpp>
#include "weight.h"
#include "aa.h"
#include "n2a.h"
Expand Down Expand Up @@ -1052,8 +1051,6 @@ void CHashSearch::Searching(int k, CQrPckg& Query, CDbPckg& Db)
muMonitor.unlock();

int nFoundHit = 0;
//using namespace boost::chrono;
//thread_clock::time_point start = thread_clock::now();

MRESULT mRes;
for (int nStep = 0; nStep < m_nIdxScl; ++nStep)
Expand Down Expand Up @@ -1539,8 +1536,6 @@ int CHashSearch::ExtendSeq2Set(int nSeed, uint unLocalSeedLen, vector<uchar>& vE
VNAMES& vQNames, VNAMES& vDNames,
MRESULT& mRes, int nTreadID)
{
//using namespace boost::chrono;
//thread_clock::time_point st = thread_clock::now();
// find a proper range for the comparisons
int nSt = 0;
int nEd = 0;
Expand Down
43 changes: 0 additions & 43 deletions Src/Makefile

This file was deleted.

4 changes: 4 additions & 0 deletions Src/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
bin_PROGRAMS = rapsearch prerapsearch

rapsearch_SOURCES = main.cpp HashSearch.cpp BlastStat.cpp Seg.cpp mergeUnit.cpp
prerapsearch_SOURCES = BuildHash.cpp HashSearch.cpp BlastStat.cpp Seg.cpp mergeUnit.cpp
175 changes: 0 additions & 175 deletions Src/boost/algorithm/clamp.hpp

This file was deleted.

91 changes: 0 additions & 91 deletions Src/boost/algorithm/cxx11/all_of.hpp

This file was deleted.

Loading