update the linking

Makefile.am

@@ -16,7 +16,7 @@ TESTS = unit_tests io_unit_tests
 check_PROGRAMS = unit_tests dEploid_dbg dEploid_prof io_unit_tests
 PROG = DEPLOID
 
-common_flags = -std=c++0x -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\"
+common_flags = -std=c++0x -Isrc/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\"
 common_LDADD = -lz
 
 common_src = src/random/fastfunc.cpp \

src/codeCogs/randomSample.hpp

@@ -15,7 +15,7 @@
 #define STATS_DISTS_CONTINUOUS_NORMAL_RANDOMSAMPLE_H
 
 #include <math.h>
-#include "src/codeCogs/mersenne.hpp"
+#include "codeCogs/mersenne.hpp"
 
 #define NORMALDENS(x) ((fabs(x) > 8.0) ? 0 : 0.398942280 * exp(- x * x / 2))
 

src/debug/mcmcDebug.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "src/mcmc.hpp"
+#include "mcmc.hpp"
 
 
 bool McmcMachinery::doutProp() {

src/debug/vcfReaderDebug.cpp

@@ -24,8 +24,8 @@
  */
 
 #include <iostream>      // std::cout
-#include "src/global.h"
-#include "src/vcfReader.hpp"
+#include "global.h"
+#include "vcfReader.hpp"
 
 using std::endl;
 

src/export/dEploidIOExport.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "src/dEploidIO.hpp"
-#include "src/mcmc.hpp"
+#include "dEploidIO.hpp"
+#include "mcmc.hpp"
 
 
 void DEploidIO::wrapUp(){

src/export/dEploidIOExportPosteriorProb.cpp

@@ -23,9 +23,9 @@
  *
  */
 
-#include "src/dEploidIO.hpp"
-#include "src/updateHap.hpp"
-#include "src/mcmc.hpp"
+#include "dEploidIO.hpp"
+#include "updateHap.hpp"
+#include "mcmc.hpp"
 
 void McmcMachinery::writeLastFwdProb(bool useIBD){
     if ( this->dEploidIO_ ->doExportPostProb() != true ){

src/export/writeMcmcRelated.cpp

@@ -23,8 +23,8 @@
  *
  */
 
-#include "src/dEploidIO.hpp"
-#include "src/mcmc.hpp"
+#include "dEploidIO.hpp"
+#include "mcmc.hpp"
 
 void DEploidIO::writeMcmcRelated (McmcSample * mcmcSample, bool useIBD){
     this->writeProp( mcmcSample, useIBD );

src/gzstream/gzstream.cpp

@@ -28,7 +28,7 @@
 
 #include <iostream>
 #include <string.h>  // for memcpy
-#include "src/gzstream/gzstream.h"
+#include "gzstream/gzstream.h"
 
 #ifdef GZSTREAM_NAMESPACE
 namespace GZSTREAM_NAMESPACE {

src/utility.cpp

@@ -23,12 +23,12 @@
  *
  */
 
-#include "src/utility.hpp"
+#include "utility.hpp"
 #include <iterator>     // std::distance
 #include <algorithm> // find
-#include "src/codeCogs/loggammasum.h" // which includes log_gamma.h
-#include "src/codeCogs/gamma.h"
-#include "src/codeCogs/logbeta.h"
+#include "codeCogs/loggammasum.h" // which includes log_gamma.h
+#include "codeCogs/gamma.h"
+#include "codeCogs/logbeta.h"
 
 
 

src/variantIndex.hpp

@@ -30,7 +30,7 @@
 #include <vector>
 #include <string>
 #include <cassert>
-#include "src/global.h"
+#include "global.h"
 
 
 using std::vector;