From 35dd99aa3d47805b661fe3126a951710fa7dee11 Mon Sep 17 00:00:00 2001
From: Michael Vrable <vrable@cs.hmc.edu>
Date: Wed, 29 Aug 2012 21:28:16 -0700
Subject: [PATCH] Create a third_party directory for files copied from other
 projects.

---
 Makefile                         | 5 +++--
 main.cc                          | 2 +-
 store.h                          | 2 +-
 subfile.cc                       | 4 ++--
 subfile.h                        | 2 +-
 chunk.cc => third_party/chunk.cc | 0
 chunk.h => third_party/chunk.h   | 0
 sha1.cc => third_party/sha1.cc   | 0
 sha1.h => third_party/sha1.h     | 0
 9 files changed, 8 insertions(+), 7 deletions(-)
 rename chunk.cc => third_party/chunk.cc (100%)
 rename chunk.h => third_party/chunk.h (100%)
 rename sha1.cc => third_party/sha1.cc (100%)
 rename sha1.h => third_party/sha1.h (100%)

diff --git a/Makefile b/Makefile
index 162d9f9..e707305 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,9 @@ CXXFLAGS=-O -Wall -Wextra -D_FILE_OFFSET_BITS=64 $(DEBUG) \
 	 -DCUMULUS_VERSION=$(shell cat version)
 LDFLAGS=$(DEBUG) $(shell pkg-config --libs $(PACKAGES))
 
-SRCS=chunk.cc exclude.cc localdb.cc main.cc metadata.cc ref.cc remote.cc \
-     sha1.cc store.cc subfile.cc util.cc
+THIRD_PARTY_SRCS=chunk.cc sha1.cc
+SRCS=exclude.cc localdb.cc main.cc metadata.cc ref.cc remote.cc \
+     store.cc subfile.cc util.cc $(addprefix third_party/,$(THIRD_PARTY_SRCS))
 OBJS=$(SRCS:.cc=.o)
 
 cumulus : $(OBJS)
diff --git a/main.cc b/main.cc
index a8e345f..297e805 100644
--- a/main.cc
+++ b/main.cc
@@ -53,9 +53,9 @@
 #include "metadata.h"
 #include "remote.h"
 #include "store.h"
-#include "sha1.h"
 #include "subfile.h"
 #include "util.h"
+#include "third_party/sha1.h"
 
 using std::list;
 using std::map;
diff --git a/store.h b/store.h
index aa98e30..aa41665 100644
--- a/store.h
+++ b/store.h
@@ -36,8 +36,8 @@
 
 #include "localdb.h"
 #include "remote.h"
-#include "sha1.h"
 #include "ref.h"
+#include "third_party/sha1.h"
 
 class LbsObject;
 
diff --git a/subfile.cc b/subfile.cc
index 4f8d0fe..eee3bdf 100644
--- a/subfile.cc
+++ b/subfile.cc
@@ -28,8 +28,8 @@
 #include <arpa/inet.h>
 
 #include "subfile.h"
-#include "chunk.h"
-#include "sha1.h"
+#include "third_party/chunk.h"
+#include "third_party/sha1.h"
 
 using std::list;
 using std::map;
diff --git a/subfile.h b/subfile.h
index 3127456..360836d 100644
--- a/subfile.h
+++ b/subfile.h
@@ -31,10 +31,10 @@
 #include <string>
 #include <vector>
 
-#include "chunk.h"
 #include "localdb.h"
 #include "ref.h"
 #include "store.h"
+#include "third_party/chunk.h"
 
 class Subfile {
 public:
diff --git a/chunk.cc b/third_party/chunk.cc
similarity index 100%
rename from chunk.cc
rename to third_party/chunk.cc
diff --git a/chunk.h b/third_party/chunk.h
similarity index 100%
rename from chunk.h
rename to third_party/chunk.h
diff --git a/sha1.cc b/third_party/sha1.cc
similarity index 100%
rename from sha1.cc
rename to third_party/sha1.cc
diff --git a/sha1.h b/third_party/sha1.h
similarity index 100%
rename from sha1.h
rename to third_party/sha1.h
-- 
2.20.1