diff --git a/Makefile.am b/Makefile.am index e6bc3fb..8a4f758 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,13 +18,13 @@ siccc_SOURCES = \ src/StaticFileHandler.H \ src/StaticFileHandler.cc \ src/sicccobject.H \ - src/sicccobject.H \ + src/sicccobject.cc \ src/sicccPersister.H \ src/sicccPersister.cc \ mongoose/mongoose.c siccc_CFLAGS = -siccc_CXXFLAGS = $(LIBJANSON_CFLAGS) ${AM_CXXFLAGS} -DDEBUG -ggdb -I./mongoose/ -siccc_LDFLAGS = $(LIBJANSON_LIBS) -ldl -pthread +siccc_CXXFLAGS = $(LIBJANSSONSTUFF_CFLAGS) ${AM_CXXFLAGS} -DDEBUG -ggdb -I./mongoose/ +siccc_LDFLAGS = $(LIBJANSSONSTUFF_LIBS) -ldl -pthread EXTRA_DIST= static/* src/eventlist.txt GPERFFLAGS = -C -k2 -LC++ -ZFoohash -Kname -H hacksh --null-strings -E -n -t -S1 diff --git a/configure.ac b/configure.ac index 7ea2a21..0a09dd2 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX -PKG_CHECK_MODULES([LIBJANSSONSTUFF],[jansson >= 2.3.1]) +PKG_CHECK_MODULES([LIBJANSSONSTUFF],[jansson >= 2.6]) AM_MISSING_PROG([GPERF], [gperf]) diff --git a/src/DynamicObjects.cc b/src/DynamicObjects.cc index 2b32b6c..a1c62f2 100644 --- a/src/DynamicObjects.cc +++ b/src/DynamicObjects.cc @@ -8,9 +8,9 @@ std::string DynamicObjects::render_object_list(){