From e4b5ce885062bea27c5a13a0f81cb61d719c9455 Mon Sep 17 00:00:00 2001
From: Damiano Boppart <damiano@pep-security.net>
Date: Wed, 14 Mar 2018 17:13:57 +0100
Subject: [PATCH] Fix Makefile again

---
 .hgignore       | 1 +
 README.md       | 2 +-
 server/Makefile | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.hgignore b/.hgignore
index 396c6e1..c430f3d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -45,6 +45,7 @@ libevent-*-stable/build/
 
 server/pep-json-server
 server/servertest
+server/unittests
 server/*.a
 server/prefix-config.cc
 server/local.conf
diff --git a/README.md b/README.md
index a031273..9e2d7bf 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ make install
 
 ### Build and install the JSON server
 ~~~~~
-cd cd ~/code/json-ad/server
+cd ~/code/json-ad/server
 ~~~~~
 
 Edit the build configuration to your needs in `./Makefile.conf`, or create a
diff --git a/server/Makefile b/server/Makefile
index 2774686..ba2a8e2 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -84,6 +84,8 @@ $(TARGET)-static: main.o libjson-adapter.a
 	$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -static -o $@
 
 $(TARGET_TEST): servertest.o libjson-adapter.a
+	$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@
+
 $(TARGET_GTEST): unittest_json.o gtest-all.o gtest_main.o libjson-adapter.a
 	$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@
 
@@ -94,6 +96,8 @@ prefix-config.cc:
 	echo '// This file is generated by make. Edit the Makefile, not this file!\n#include "prefix-config.hh" \nconst char* const html_directory = "'$(HTML_DIRECTORY)'";\n' > $@
 
 gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -o $@ -c $<
+
 gtest_main.o: $(GTEST_DIR)/src/gtest_main.cc
 	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -o $@ -c $<