diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/omelasticsearch/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/README (renamed from runtime/cJSON/README) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/cjson.c (renamed from runtime/cJSON/cjson.c) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/cjson.h (renamed from runtime/cJSON/cjson.h) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/test.c (renamed from runtime/cJSON/test.c) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/tests/test1 (renamed from runtime/cJSON/tests/test1) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/tests/test2 (renamed from runtime/cJSON/tests/test2) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/tests/test3 (renamed from runtime/cJSON/tests/test3) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/tests/test4 (renamed from runtime/cJSON/tests/test4) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/cJSON/tests/test5 (renamed from runtime/cJSON/tests/test5) | 0 | ||||
| -rw-r--r-- | plugins/omelasticsearch/omelasticsearch.c | 2 | ||||
| -rw-r--r-- | runtime/Makefile.am | 5 |
13 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 31e302b9..660c7ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -773,7 +773,7 @@ AC_ARG_ENABLE(rsyslogrt, [enable_rsyslogrt=yes] ) if test "x$enable_rsyslogrt" = "xyes"; then - RSRT_CFLAGS1="-I\$(top_srcdir)/runtime -I\$(top_srcdir)/runtime/cJSON -I\$(top_srcdir) -I\$(top_srcdir)/grammar" + RSRT_CFLAGS1="-I\$(top_srcdir)/runtime -I\$(top_srcdir) -I\$(top_srcdir)/grammar" RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la" fi AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes) diff --git a/plugins/omelasticsearch/Makefile.am b/plugins/omelasticsearch/Makefile.am index a574c72f..059bdf8a 100644 --- a/plugins/omelasticsearch/Makefile.am +++ b/plugins/omelasticsearch/Makefile.am @@ -1,6 +1,7 @@ pkglib_LTLIBRARIES = omelasticsearch.la -omelasticsearch_la_SOURCES = omelasticsearch.c +# TODO: replace cJSON +omelasticsearch_la_SOURCES = omelasticsearch.c cJSON/cjson.c cJSON/cjson.h omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) omelasticsearch_la_LDFLAGS = -module -avoid-version omelasticsearch_la_LIBADD = $(CURL_LIBS) diff --git a/runtime/cJSON/README b/plugins/omelasticsearch/cJSON/README index 7531c049..7531c049 100644 --- a/runtime/cJSON/README +++ b/plugins/omelasticsearch/cJSON/README diff --git a/runtime/cJSON/cjson.c b/plugins/omelasticsearch/cJSON/cjson.c index 99a831e9..99a831e9 100644 --- a/runtime/cJSON/cjson.c +++ b/plugins/omelasticsearch/cJSON/cjson.c diff --git a/runtime/cJSON/cjson.h b/plugins/omelasticsearch/cJSON/cjson.h index a621720c..a621720c 100644 --- a/runtime/cJSON/cjson.h +++ b/plugins/omelasticsearch/cJSON/cjson.h diff --git a/runtime/cJSON/test.c b/plugins/omelasticsearch/cJSON/test.c index 2cab632a..2cab632a 100644 --- a/runtime/cJSON/test.c +++ b/plugins/omelasticsearch/cJSON/test.c diff --git a/runtime/cJSON/tests/test1 b/plugins/omelasticsearch/cJSON/tests/test1 index eacfbf5e..eacfbf5e 100644 --- a/runtime/cJSON/tests/test1 +++ b/plugins/omelasticsearch/cJSON/tests/test1 diff --git a/runtime/cJSON/tests/test2 b/plugins/omelasticsearch/cJSON/tests/test2 index 5600991a..5600991a 100644 --- a/runtime/cJSON/tests/test2 +++ b/plugins/omelasticsearch/cJSON/tests/test2 diff --git a/runtime/cJSON/tests/test3 b/plugins/omelasticsearch/cJSON/tests/test3 index 5662b377..5662b377 100644 --- a/runtime/cJSON/tests/test3 +++ b/plugins/omelasticsearch/cJSON/tests/test3 diff --git a/runtime/cJSON/tests/test4 b/plugins/omelasticsearch/cJSON/tests/test4 index d540b57f..d540b57f 100644 --- a/runtime/cJSON/tests/test4 +++ b/plugins/omelasticsearch/cJSON/tests/test4 diff --git a/runtime/cJSON/tests/test5 b/plugins/omelasticsearch/cJSON/tests/test5 index 49980ca2..49980ca2 100644 --- a/runtime/cJSON/tests/test5 +++ b/plugins/omelasticsearch/cJSON/tests/test5 diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index 48cfef7d..a5833b15 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -37,7 +37,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include "cjson.h" +#include "cJSON/cjson.h" #include "conf.h" #include "syslogd-types.h" #include "srUtils.h" diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 42640997..c957782f 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -87,10 +87,7 @@ librsyslog_la_SOURCES = \ ../outchannel.c \ ../outchannel.h \ ../template.c \ - ../template.h \ - \ - cJSON/cjson.c \ - cJSON/cjson.h + ../template.h # the files with ../ we need to work on - so that they either become part of the # runtime or will no longer be needed. -- rgerhards, 2008-06-13 |