Using upstream jsoncpp library

mwolf76 · Dec 25, 2016 · 82bde96 · 82bde96
1 parent d32717a
commit 82bde96
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 6,006 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -60,8 +60,7 @@ yasmv_LDADD = $(top_builddir)/src/parser/libparser.la				\
 		$(top_builddir)/src/opts/libopts.la				\
 										\
 		$(top_builddir)/src/dd/libcudd.la -lminisat -lantlr3c		\
-		$(top_builddir)/src/3rdparty/jsoncpp/libjson.la			\
-		$(BOOST_PROGRAM_OPTIONS_LIBS)					\
+		-ljsoncpp $(BOOST_PROGRAM_OPTIONS_LIBS)				\
 		$(BOOST_FILESYSTEM_LIBS) $(BOOST_THREAD_LIBS)			\
 		$(BOOST_CHRONO_LIBS)
 
@@ -99,8 +98,7 @@ tests_LDADD = $(top_builddir)/src/parser/libparser.la				\
 		$(top_builddir)/src/opts/libopts.la				\
 										\
 		$(top_builddir)/src/dd/libcudd.la -lminisat -lantlr3c		\
-		$(top_builddir)/src/3rdparty/jsoncpp/libjson.la			\
-		$(BOOST_PROGRAM_OPTIONS_LIBS)					\
+		-ljsoncpp $(BOOST_PROGRAM_OPTIONS_LIBS)				\
 		$(BOOST_FILESYSTEM_LIBS) $(BOOST_THREAD_LIBS)			\
 		$(BOOST_CHRONO_LIBS) -lboost_unit_test_framework
 

diff --git a/configure.ac b/configure.ac
@@ -143,7 +143,6 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/3rdparty/Makefile
                  src/3rdparty/ezlogger/Makefile
-                 src/3rdparty/jsoncpp/Makefile
                  src/cmd/Makefile
                  src/cmd/commands/Makefile
                  src/common/Makefile

diff --git a/src/3rdparty/Makefile.am b/src/3rdparty/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
-SUBDIRS = ezlogger jsoncpp
+SUBDIRS = ezlogger
 
 # -------------------------------------------------------
 

diff --git a/src/3rdparty/jsoncpp/Makefile.am b/src/3rdparty/jsoncpp/Makefile.am
diff --git a/src/3rdparty/jsoncpp/json-forwards.hh b/src/3rdparty/jsoncpp/json-forwards.hh