From e8cfd96ccf8ab90afd457b98800511537f3ac731 Mon Sep 17 00:00:00 2001
From: Jonas Granquist <jonas.granqvist@gmail.com>
Date: Sat, 25 Feb 2012 08:50:42 +0100
Subject: [PATCH] Move the code into a header file

---
 GildedRose/cpp/{GildedRose.cc => GildedRose.h} |  0
 GildedRose/cpp/Makefile                        | 12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename GildedRose/cpp/{GildedRose.cc => GildedRose.h} (100%)

diff --git a/GildedRose/cpp/GildedRose.cc b/GildedRose/cpp/GildedRose.h
similarity index 100%
rename from GildedRose/cpp/GildedRose.cc
rename to GildedRose/cpp/GildedRose.h
diff --git a/GildedRose/cpp/Makefile b/GildedRose/cpp/Makefile
index e5e1d3e9..460e959d 100644
--- a/GildedRose/cpp/Makefile
+++ b/GildedRose/cpp/Makefile
@@ -12,7 +12,7 @@
 
 # Points to the root of Google Test, relative to where this file is.
 # Remember to tweak this if you move this file.
-GTEST_DIR = gtest
+GTEST_DIR = ../../../googletest
 
 # Where to find user code.
 USER_DIR = .
@@ -67,9 +67,9 @@ gtest_main.a : gtest-all.o gtest_main.o
 # gtest_main.a, depending on whether it defines its own main()
 # function.
 
-GildedRose.o : $(USER_DIR)/GildedRose.cc \
-  $(GTEST_HEADERS)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.cc
+#GildedRose.o : $(USER_DIR)/GildedRose.h \
+#  $(GTEST_HEADERS)
+#	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.h
 
-GildedRose : GildedRose.o gtest_main.a
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@
+GildedRose : GildedRose.h gtest_main.a
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(USER_DIR)/GildedRose.h -pthread $^ -o $@