From 2b393ad8e51bec058f46021dede679ba1a969f0c Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Wed, 27 Apr 2016 15:33:30 -0700
Subject: [PATCH] Move jsonpull into a subdirectory like other included
 libraries

---
 CHANGELOG.md                      |  4 ++++
 Makefile                          | 13 +++----------
 geojson.cpp                       |  2 +-
 jsonpull.c => jsonpull/jsonpull.c |  0
 jsonpull.h => jsonpull/jsonpull.h |  0
 main.cpp                          |  2 +-
 version.hpp                       |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)
 rename jsonpull.c => jsonpull/jsonpull.c (100%)
 rename jsonpull.h => jsonpull/jsonpull.h (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5ce486..01663e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.11.0
+
+* Convert C source files to C++
+
 ## 1.10.0
 
 * Upgrade Clipper to fix potential crashes and improve polygon topology
diff --git a/Makefile b/Makefile
index 4e62b3e..90ecedb 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ C = $(wildcard *.c) $(wildcard *.cpp)
 INCLUDES = -I/usr/local/include -I.
 LIBS = -L/usr/local/lib
 
-tippecanoe: geojson.o jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o clipper.o mvt.o serial.o main.o
+tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o clipper/clipper.o mvt.o serial.o main.o
 	$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
 
 tippecanoe-enumerate: enumerate.o
@@ -54,18 +54,11 @@ tippecanoe-decode: decode.o projection.o mvt.o
 tile-join: tile-join.o projection.o pool.o mbtiles.o mvt.o memfile.o
 	$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3
 
-libjsonpull.a: jsonpull.o
-	$(AR) rc $@ $^
-	ranlib $@
-
 %.o: %.c $(H)
-	$(CC) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CFLAGS) -c $<
+	$(CC) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CFLAGS) -c -o $@ $<
 
 %.o: %.cpp $(H)
-	$(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c $<
-
-clipper.o: clipper/clipper.cpp $(H)
-	$(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c -o $@ $<
 
 clean:
 	rm -f tippecanoe *.o
diff --git a/geojson.cpp b/geojson.cpp
index f8f0c75..1ae9805 100644
--- a/geojson.cpp
+++ b/geojson.cpp
@@ -22,7 +22,7 @@
 #include <vector>
 
 extern "C" {
-#include "jsonpull.h"
+#include "jsonpull/jsonpull.h"
 }
 
 #include "pool.hpp"
diff --git a/jsonpull.c b/jsonpull/jsonpull.c
similarity index 100%
rename from jsonpull.c
rename to jsonpull/jsonpull.c
diff --git a/jsonpull.h b/jsonpull/jsonpull.h
similarity index 100%
rename from jsonpull.h
rename to jsonpull/jsonpull.h
diff --git a/main.cpp b/main.cpp
index eb27e83..27b55e8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -32,7 +32,7 @@
 #endif
 
 extern "C" {
-#include "jsonpull.h"
+#include "jsonpull/jsonpull.h"
 }
 
 #include "tile.hpp"
diff --git a/version.hpp b/version.hpp
index c3cfbb4..3539096 100644
--- a/version.hpp
+++ b/version.hpp
@@ -1 +1 @@
-#define VERSION "tippecanoe v1.10.0\n"
+#define VERSION "tippecanoe v1.11.0\n"