From 81749e6b637997156c481e7f1d74fd319ba7b1d4 Mon Sep 17 00:00:00 2001
From: tqchen <tianqi.tchen@gmail.com>
Date: Sun, 18 Jan 2015 21:31:16 -0800
Subject: [PATCH] Squashed 'subtree/rabit/' changes from c7282ac..1db6449

1db6449 remove include in -I, make things easier to direct compile

git-subtree-dir: subtree/rabit
git-subtree-split: 1db6449b019902e99de446c84aa36e73c03eb888
---
 Makefile                 | 2 +-
 src/allreduce_base.h     | 4 ++--
 src/allreduce_mock.h     | 2 +-
 src/allreduce_robust.cc  | 8 ++++----
 src/allreduce_robust.h   | 2 +-
 src/engine.cc            | 2 +-
 src/engine_empty.cc      | 2 +-
 src/engine_mpi.cc        | 4 ++--
 src/socket.h             | 2 +-
 wrapper/rabit_wrapper.cc | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index da9bb22fb..33925d025 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export CXX = g++
 export MPICXX = mpicxx
 export LDFLAGS= -Llib
 export WARNFLAGS= -Wall -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -pedantic 
-export CFLAGS = -O3 -msse2 -fPIC -Iinclude $(WARNFLAGS) 
+export CFLAGS = -O3 -msse2 -fPIC $(WARNFLAGS) 
 
 # build path
 BPATH=.
diff --git a/src/allreduce_base.h b/src/allreduce_base.h
index b1cc71ef1..3c442c7f4 100644
--- a/src/allreduce_base.h
+++ b/src/allreduce_base.h
@@ -15,8 +15,8 @@
 #include <vector>
 #include <string>
 #include <algorithm>
-#include "rabit/utils.h"
-#include "rabit/engine.h"
+#include "../include/rabit/utils.h"
+#include "../include/rabit/engine.h"
 #include "./socket.h"
 
 namespace MPI {
diff --git a/src/allreduce_mock.h b/src/allreduce_mock.h
index 1e08d57ed..33b8b60ae 100644
--- a/src/allreduce_mock.h
+++ b/src/allreduce_mock.h
@@ -8,8 +8,8 @@
 #ifndef RABIT_ALLREDUCE_MOCK_H
 #define RABIT_ALLREDUCE_MOCK_H
 #include <vector>
-#include <rabit/engine.h>
 #include <map>
+#include "../include/rabit/engine.h"
 #include "./allreduce_robust.h"
 
 namespace rabit {
diff --git a/src/allreduce_robust.cc b/src/allreduce_robust.cc
index 9b2fed03b..7f379237f 100644
--- a/src/allreduce_robust.cc
+++ b/src/allreduce_robust.cc
@@ -10,10 +10,10 @@
 #define NOMINMAX
 #include <limits>
 #include <utility>
-#include <rabit/io.h>
-#include "rabit/utils.h"
-#include "rabit/engine.h"
-#include "rabit/rabit-inl.h"
+#include "../include/rabit/io.h"
+#include "../include/rabit/utils.h"
+#include "../include/rabit/engine.h"
+#include "../include/rabit/rabit-inl.h"
 #include "./allreduce_robust.h"
 
 namespace rabit {
diff --git a/src/allreduce_robust.h b/src/allreduce_robust.h
index 23a3964d8..ff5c046ac 100644
--- a/src/allreduce_robust.h
+++ b/src/allreduce_robust.h
@@ -13,7 +13,7 @@
 #include <vector>
 #include <string>
 #include <algorithm>
-#include "rabit/engine.h"
+#include "../include/rabit/engine.h"
 #include "./allreduce_base.h"
 
 namespace rabit {
diff --git a/src/engine.cc b/src/engine.cc
index 1aa220f0e..b58f738d3 100644
--- a/src/engine.cc
+++ b/src/engine.cc
@@ -10,7 +10,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 #define NOMINMAX
 
-#include <rabit/engine.h>
+#include "../include/rabit/engine.h"
 #include "./allreduce_base.h"
 #include "./allreduce_robust.h"
 
diff --git a/src/engine_empty.cc b/src/engine_empty.cc
index 3d14e3ef3..298872ea0 100644
--- a/src/engine_empty.cc
+++ b/src/engine_empty.cc
@@ -10,7 +10,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 #define NOMINMAX
 
-#include <rabit/engine.h>
+#include "../include/rabit/engine.h"
 
 namespace rabit {
 namespace engine {
diff --git a/src/engine_mpi.cc b/src/engine_mpi.cc
index 006a91006..9962745a2 100644
--- a/src/engine_mpi.cc
+++ b/src/engine_mpi.cc
@@ -11,8 +11,8 @@
 #define NOMINMAX
 #include <mpi.h>
 #include <cstdio>
-#include "rabit/engine.h"
-#include "rabit/utils.h"
+#include "../include/rabit/engine.h"
+#include "../include/rabit/utils.h"
 
 namespace rabit {
 namespace engine {
diff --git a/src/socket.h b/src/socket.h
index c7ffd11ad..c0eb6278c 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -25,7 +25,7 @@
 #endif
 #include <string>
 #include <cstring>
-#include "rabit/utils.h"
+#include "../include/rabit/utils.h"
 
 #if defined(_WIN32)
 typedef int ssize_t;
diff --git a/wrapper/rabit_wrapper.cc b/wrapper/rabit_wrapper.cc
index 9ff25b09f..ac2708f00 100644
--- a/wrapper/rabit_wrapper.cc
+++ b/wrapper/rabit_wrapper.cc
@@ -2,9 +2,9 @@
 #define _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include <rabit.h>
 #include <cstring>
 #include <string>
+#include "../include/rabit.h"
 #include "./rabit_wrapper.h"
 namespace rabit {
 namespace wrapper {