moved json code to src/lib
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 8 Nov 2011 11:22:36 +0000 (11:22 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 8 Nov 2011 11:22:36 +0000 (11:22 +0000)
14 files changed:
configure
configure.ac
src/Makefile.am
src/Makefile.in
src/lib/Makefile.am
src/lib/Makefile.in
src/lib/psensor_json.c [new file with mode: 0644]
src/lib/psensor_json.h [new file with mode: 0644]
src/libpsensor_json/Makefile.am [deleted file]
src/libpsensor_json/Makefile.in [deleted file]
src/libpsensor_json/psensor_json.c [deleted file]
src/libpsensor_json/psensor_json.h [deleted file]
src/server/Makefile.am
src/server/Makefile.in

index 11560f7..288b883 100755 (executable)
--- a/configure
+++ b/configure
@@ -8552,7 +8552,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/glade/Makefile src/lib/Makefile src/libpsensor_json/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/64x64/Makefile icons/ubuntu-mono-dark/status/22/Makefile icons/ubuntu-mono-light/status/22/Makefile icons/ubuntu-mono-dark/apps/22/Makefile www/Makefile po/Makefile.in tests/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/glade/Makefile src/lib/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/64x64/Makefile icons/ubuntu-mono-dark/status/22/Makefile icons/ubuntu-mono-light/status/22/Makefile icons/ubuntu-mono-dark/apps/22/Makefile www/Makefile po/Makefile.in tests/Makefile"
 
 
 for ac_prog in help2man
@@ -9386,7 +9386,6 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;;
     "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
-    "src/libpsensor_json/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpsensor_json/Makefile" ;;
     "src/server/Makefile") CONFIG_FILES="$CONFIG_FILES src/server/Makefile" ;;
     "icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/scalable/Makefile" ;;
     "icons/hicolor/14x14/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/14x14/Makefile" ;;
index 79b4675..a6e89d4 100644 (file)
@@ -227,7 +227,6 @@ AC_CONFIG_FILES([
  src/Makefile
  src/glade/Makefile
  src/lib/Makefile
- src/libpsensor_json/Makefile
  src/server/Makefile
  icons/hicolor/scalable/Makefile
  icons/hicolor/14x14/Makefile
index 18f8d0a..189bcde 100644 (file)
@@ -2,10 +2,6 @@ SUBDIRS = lib glade
 
 AM_LDFLAGS = -Wl,--as-needed 
 
-if JSON
-SUBDIRS += libpsensor_json
-endif
-
 if LIBMICROHTTPD
 if JSON
 SUBDIRS += server
index 279ae2c..6906604 100644 (file)
@@ -34,27 +34,26 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@JSON_TRUE@am__append_1 = libpsensor_json
-@JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_2 = server
+@JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_1 = server
 bin_PROGRAMS = psensor$(EXEEXT)
-@GTOP_TRUE@am__append_3 = $(GTOP_CFLAGS)
-@GTOP_TRUE@am__append_4 = $(GTOP_LIBS)
-@LIBNOTIFY_TRUE@am__append_5 = ui_notify.h ui_notify.c
-@LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_LIBS)
-@LIBNOTIFY_TRUE@am__append_7 = $(LIBNOTIFY_CFLAGS)
-@APPINDICATOR_TRUE@am__append_8 = ui_appindicator.h ui_appindicator.c 
-@APPINDICATOR_TRUE@am__append_9 = $(APPINDICATOR_LIBS)
-@APPINDICATOR_TRUE@am__append_10 = $(APPINDICATOR_CFLAGS)
-@NVIDIA_TRUE@am__append_11 = $(NVIDIA_CFLAGS)
-@NVIDIA_TRUE@am__append_12 = $(NVIDIA_LIBS)
-@LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_CFLAGS)
-@LIBATIADL_TRUE@am__append_14 = $(LIBATIADL_LIBS)
-@UNITY_TRUE@am__append_15 = ui_unity.h ui_unity.c
-@UNITY_TRUE@am__append_16 = $(UNITY_CFLAGS)
-@UNITY_TRUE@am__append_17 = $(UNITY_LIBS) 
-@CURL_TRUE@@JSON_TRUE@am__append_18 = rsensor.h rsensor.c
-@CURL_TRUE@@JSON_TRUE@am__append_19 = $(CURL_LIBS) $(JSON_LIBS)
-@CURL_TRUE@@JSON_TRUE@am__append_20 = $(CURL_CFLAGS) $(JSON_CFLAGS)
+@GTOP_TRUE@am__append_2 = $(GTOP_CFLAGS)
+@GTOP_TRUE@am__append_3 = $(GTOP_LIBS)
+@LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c
+@LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_LIBS)
+@LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_CFLAGS)
+@APPINDICATOR_TRUE@am__append_7 = ui_appindicator.h ui_appindicator.c 
+@APPINDICATOR_TRUE@am__append_8 = $(APPINDICATOR_LIBS)
+@APPINDICATOR_TRUE@am__append_9 = $(APPINDICATOR_CFLAGS)
+@NVIDIA_TRUE@am__append_10 = $(NVIDIA_CFLAGS)
+@NVIDIA_TRUE@am__append_11 = $(NVIDIA_LIBS)
+@LIBATIADL_TRUE@am__append_12 = $(LIBATIADL_CFLAGS)
+@LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_LIBS)
+@UNITY_TRUE@am__append_14 = ui_unity.h ui_unity.c
+@UNITY_TRUE@am__append_15 = $(UNITY_CFLAGS)
+@UNITY_TRUE@am__append_16 = $(UNITY_LIBS) 
+@CURL_TRUE@@JSON_TRUE@am__append_17 = rsensor.h rsensor.c
+@CURL_TRUE@@JSON_TRUE@am__append_18 = $(CURL_LIBS) $(JSON_LIBS)
+@CURL_TRUE@@JSON_TRUE@am__append_19 = $(CURL_CFLAGS) $(JSON_CFLAGS)
 subdir = src
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
@@ -133,7 +132,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
        distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = lib glade libpsensor_json server
+DIST_SUBDIRS = lib glade server
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -214,9 +213,9 @@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(SENSORS_LIBS) \
-       $(am__append_4) $(am__append_6) $(am__append_9) \
-       $(am__append_12) $(am__append_14) $(am__append_17) \
-       $(am__append_19)
+       $(am__append_3) $(am__append_5) $(am__append_8) \
+       $(am__append_11) $(am__append_13) $(am__append_16) \
+       $(am__append_18)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -307,20 +306,20 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = lib glade $(am__append_1) $(am__append_2)
+SUBDIRS = lib glade $(am__append_1)
 AM_LDFLAGS = -Wl,--as-needed 
 AM_CPPFLAGS = -Wall -pedantic -Werror \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
        -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \
        $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \
-       $(am__append_3) $(am__append_7) $(am__append_10) \
-       $(am__append_11) $(am__append_13) $(am__append_16) \
-       $(am__append_20)
+       $(am__append_2) $(am__append_6) $(am__append_9) \
+       $(am__append_10) $(am__append_12) $(am__append_15) \
+       $(am__append_19)
 psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \
        ui.c ui_color.h ui_color.c ui_graph.h ui_graph.c ui_pref.h \
        ui_pref.c ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
-       ui_sensorpref.c $(am__append_5) $(am__append_8) \
-       $(am__append_15) $(am__append_18)
+       ui_sensorpref.c $(am__append_4) $(am__append_7) \
+       $(am__append_14) $(am__append_17)
 dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt
 all: all-recursive
index 48dc632..9c777ca 100644 (file)
@@ -35,6 +35,12 @@ LIBS += $(GTOP_LIBS)
 AM_CPPFLAGS += $(GTOP_CFLAGS)
 endif
 
+if JSON
+libpsensor_a_SOURCES += psensor_json.h psensor_json.c
+LIBS += $(JSON_LIBS)
+AM_CPPFLAGS += $(JSON_CFLAGS)
+endif
+
 EXTRA_DIST=$(libpsensor_a_SOURCES) \
        amd.c \
        cpu.c \
index fd21574..3025977 100644 (file)
@@ -42,6 +42,9 @@ host_triplet = @host@
 @GTOP_TRUE@am__append_6 = cpu.c
 @GTOP_TRUE@am__append_7 = $(GTOP_LIBS)
 @GTOP_TRUE@am__append_8 = $(GTOP_CFLAGS)
+@JSON_TRUE@am__append_9 = psensor_json.h psensor_json.c
+@JSON_TRUE@am__append_10 = $(JSON_LIBS)
+@JSON_TRUE@am__append_11 = $(JSON_CFLAGS)
 subdir = src/lib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -60,16 +63,17 @@ libpsensor_a_LIBADD =
 am__libpsensor_a_SOURCES_DIST = amd.h cpu.h measure.h measure.c \
        color.h color.c log.h log.c psensor.h psensor.c hdd.h hdd.c \
        nvidia.h lmsensor.h lmsensor.c p_io.h p_io.c url.c url.h \
-       nvidia.c amd.c cpu.c
+       nvidia.c amd.c cpu.c psensor_json.h psensor_json.c
 @NVIDIA_TRUE@am__objects_1 = libpsensor_a-nvidia.$(OBJEXT)
 @LIBATIADL_TRUE@am__objects_2 = libpsensor_a-amd.$(OBJEXT)
 @GTOP_TRUE@am__objects_3 = libpsensor_a-cpu.$(OBJEXT)
+@JSON_TRUE@am__objects_4 = libpsensor_a-psensor_json.$(OBJEXT)
 am_libpsensor_a_OBJECTS = libpsensor_a-measure.$(OBJEXT) \
        libpsensor_a-color.$(OBJEXT) libpsensor_a-log.$(OBJEXT) \
        libpsensor_a-psensor.$(OBJEXT) libpsensor_a-hdd.$(OBJEXT) \
        libpsensor_a-lmsensor.$(OBJEXT) libpsensor_a-p_io.$(OBJEXT) \
        libpsensor_a-url.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-       $(am__objects_3)
+       $(am__objects_3) $(am__objects_4)
 libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -137,7 +141,7 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@ $(am__append_2) $(am__append_7)
+LIBS = @LIBS@ $(am__append_2) $(am__append_7) $(am__append_10)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -233,8 +237,9 @@ libpsensor_a_CFLAGS = -Wall -Werror $(am__append_5)
 libpsensor_a_SOURCES = amd.h cpu.h measure.h measure.c color.h color.c \
        log.h log.c psensor.h psensor.c hdd.h hdd.c nvidia.h \
        lmsensor.h lmsensor.c p_io.h p_io.c url.c url.h \
-       $(am__append_1) $(am__append_4) $(am__append_6)
-AM_CPPFLAGS = $(am__append_3) $(am__append_8)
+       $(am__append_1) $(am__append_4) $(am__append_6) \
+       $(am__append_9)
+AM_CPPFLAGS = $(am__append_3) $(am__append_8) $(am__append_11)
 EXTRA_DIST = $(libpsensor_a_SOURCES) \
        amd.c \
        cpu.c \
@@ -298,6 +303,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-nvidia.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-p_io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-psensor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-psensor_json.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-url.Po@am__quote@
 
 .c.o:
@@ -468,6 +474,20 @@ libpsensor_a-cpu.obj: cpu.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-cpu.obj `if test -f 'cpu.c'; then $(CYGPATH_W) 'cpu.c'; else $(CYGPATH_W) '$(srcdir)/cpu.c'; fi`
 
+libpsensor_a-psensor_json.o: psensor_json.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-psensor_json.o -MD -MP -MF $(DEPDIR)/libpsensor_a-psensor_json.Tpo -c -o libpsensor_a-psensor_json.o `test -f 'psensor_json.c' || echo '$(srcdir)/'`psensor_json.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libpsensor_a-psensor_json.Tpo $(DEPDIR)/libpsensor_a-psensor_json.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='psensor_json.c' object='libpsensor_a-psensor_json.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-psensor_json.o `test -f 'psensor_json.c' || echo '$(srcdir)/'`psensor_json.c
+
+libpsensor_a-psensor_json.obj: psensor_json.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-psensor_json.obj -MD -MP -MF $(DEPDIR)/libpsensor_a-psensor_json.Tpo -c -o libpsensor_a-psensor_json.obj `if test -f 'psensor_json.c'; then $(CYGPATH_W) 'psensor_json.c'; else $(CYGPATH_W) '$(srcdir)/psensor_json.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libpsensor_a-psensor_json.Tpo $(DEPDIR)/libpsensor_a-psensor_json.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='psensor_json.c' object='libpsensor_a-psensor_json.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-psensor_json.obj `if test -f 'psensor_json.c'; then $(CYGPATH_W) 'psensor_json.c'; else $(CYGPATH_W) '$(srcdir)/psensor_json.c'; fi`
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
diff --git a/src/lib/psensor_json.c b/src/lib/psensor_json.c
new file mode 100644 (file)
index 0000000..129e24c
--- /dev/null
@@ -0,0 +1,133 @@
+/*
+    Copyright (C) 2010-2011 jeanfi@gmail.com
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA
+*/
+
+#include <string.h>
+
+#include "psensor_json.h"
+
+#define ATT_SENSOR_ID "id"
+#define ATT_SENSOR_NAME "name"
+#define ATT_SENSOR_TYPE "type"
+#define ATT_SENSOR_MIN "min"
+#define ATT_SENSOR_MAX "max"
+#define ATT_SENSOR_LAST_MEASURE "last_measure"
+#define ATT_SENSOR_MEASURES "measures"
+#define ATT_MEASURE_VALUE "value"
+#define ATT_MEASURE_TIME "time"
+
+static json_object *
+measure_to_json_object(struct measure *m)
+{
+       json_object *o = json_object_new_object();
+
+       json_object_object_add(o,
+                              ATT_MEASURE_VALUE,
+                              json_object_new_double(m->value.d_num));
+       json_object_object_add(o, ATT_MEASURE_TIME,
+                              json_object_new_int((m->time).tv_sec));
+       return o;
+}
+
+static json_object *
+measures_to_json_object(struct psensor *s)
+{
+       json_object *o;
+       int i;
+
+       o = json_object_new_array();
+
+       for (i = 0; i < s->values_max_length; i++)
+               if (s->measures[i].time.tv_sec)
+                       json_object_array_add
+                               (o, measure_to_json_object(&s->measures[i]));
+
+
+       return o;
+}
+
+static json_object *sensor_to_json(struct psensor *s)
+{
+       json_object *mo, *obj;
+       struct measure *m;
+
+       obj = json_object_new_object();
+
+       json_object_object_add(obj,
+                              ATT_SENSOR_ID,
+                              json_object_new_string(s->id));
+       json_object_object_add(obj,
+                              ATT_SENSOR_NAME,
+                              json_object_new_string(s->name));
+       json_object_object_add(obj,
+                              ATT_SENSOR_TYPE, json_object_new_int(s->type));
+       json_object_object_add(obj,
+                              ATT_SENSOR_MIN, json_object_new_double(s->min));
+       json_object_object_add(obj,
+                              ATT_SENSOR_MAX, json_object_new_double(s->max));
+       json_object_object_add(obj,
+                              ATT_SENSOR_MEASURES,
+                              measures_to_json_object(s));
+
+       m = psensor_get_current_measure(s);
+       mo = json_object_new_object();
+       json_object_object_add(mo,
+                              ATT_MEASURE_VALUE,
+                              json_object_new_double(m->value.d_num));
+       json_object_object_add(mo, ATT_MEASURE_TIME,
+                              json_object_new_int((m->time).tv_sec));
+       json_object_object_add(obj, ATT_SENSOR_LAST_MEASURE, mo);
+
+       return obj;
+}
+
+char *sensor_to_json_string(struct psensor *s)
+{
+       char *str;
+       json_object *obj = sensor_to_json(s);
+
+       str = strdup(json_object_to_json_string(obj));
+
+       json_object_put(obj);
+
+       return str;
+}
+
+char *sensors_to_json_string(struct psensor **sensors)
+{
+       struct psensor **sensors_cur;
+       char *str;
+       json_object *obj = json_object_new_array();
+
+       sensors_cur = sensors;
+
+       while (*sensors_cur) {
+               struct psensor *s = *sensors_cur;
+
+               json_object_array_add(obj, sensor_to_json(s));
+
+               sensors_cur++;
+       }
+
+       str = strdup(json_object_to_json_string(obj));
+
+       json_object_put(obj);
+
+       return str;
+}
+
diff --git a/src/lib/psensor_json.h b/src/lib/psensor_json.h
new file mode 100644 (file)
index 0000000..cde92f0
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+    Copyright (C) 2010-2011 jeanfi@gmail.com
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA
+*/
+
+#ifndef _PSENSOR_PSENSOR_JSON_H_
+#define _PSENSOR_PSENSOR_JSON_H_
+
+#include <json/json.h>
+
+#include "psensor.h"
+
+char *sensor_to_json_string(struct psensor *s);
+char *sensors_to_json_string(struct psensor **sensors);
+
+#endif
diff --git a/src/libpsensor_json/Makefile.am b/src/libpsensor_json/Makefile.am
deleted file mode 100644 (file)
index e2bff28..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-noinst_LIBRARIES = libpsensor_json.a
-
-libpsensor_json_a_CFLAGS = -pedantic -Wall -Werror
-
-libpsensor_json_a_SOURCES = \
-       psensor_json.h psensor_json.c 
-
-LIBS = ../lib/libpsensor.a \
-       $(JSON_LIBS)
-
-AM_CPPFLAGS = $(JSON_CFLAGS) -I$(top_srcdir)/src/lib 
-
diff --git a/src/libpsensor_json/Makefile.in b/src/libpsensor_json/Makefile.in
deleted file mode 100644 (file)
index 7558443..0000000
+++ /dev/null
@@ -1,496 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/libpsensor_json
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libpsensor_json_a_AR = $(AR) $(ARFLAGS)
-libpsensor_json_a_LIBADD =
-am_libpsensor_json_a_OBJECTS =  \
-       libpsensor_json_a-psensor_json.$(OBJEXT)
-libpsensor_json_a_OBJECTS = $(am_libpsensor_json_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libpsensor_json_a_SOURCES)
-DIST_SOURCES = $(libpsensor_json_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
-APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-CURL_LIBS = @CURL_LIBS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTOP_CFLAGS = @GTOP_CFLAGS@
-GTOP_LIBS = @GTOP_LIBS@
-HELP2MAN = @HELP2MAN@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JSON_CFLAGS = @JSON_CFLAGS@
-JSON_LIBS = @JSON_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBATIADL_CFLAGS = @LIBATIADL_CFLAGS@
-LIBATIADL_LIBS = @LIBATIADL_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMICROHTTPD_CFLAGS = @LIBMICROHTTPD_CFLAGS@
-LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@
-LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
-LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = ../lib/libpsensor.a \
-       $(JSON_LIBS)
-
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NVIDIA_CFLAGS = @NVIDIA_CFLAGS@
-NVIDIA_LIBS = @NVIDIA_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SENSORS_LIBS = @SENSORS_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UNITY_CFLAGS = @UNITY_CFLAGS@
-UNITY_LIBS = @UNITY_LIBS@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libpsensor_json.a
-libpsensor_json_a_CFLAGS = -pedantic -Wall -Werror
-libpsensor_json_a_SOURCES = \
-       psensor_json.h psensor_json.c 
-
-AM_CPPFLAGS = $(JSON_CFLAGS) -I$(top_srcdir)/src/lib 
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libpsensor_json/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu src/libpsensor_json/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-       -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libpsensor_json.a: $(libpsensor_json_a_OBJECTS) $(libpsensor_json_a_DEPENDENCIES) 
-       -rm -f libpsensor_json.a
-       $(libpsensor_json_a_AR) libpsensor_json.a $(libpsensor_json_a_OBJECTS) $(libpsensor_json_a_LIBADD)
-       $(RANLIB) libpsensor_json.a
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_json_a-psensor_json.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-libpsensor_json_a-psensor_json.o: psensor_json.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_json_a_CFLAGS) $(CFLAGS) -MT libpsensor_json_a-psensor_json.o -MD -MP -MF $(DEPDIR)/libpsensor_json_a-psensor_json.Tpo -c -o libpsensor_json_a-psensor_json.o `test -f 'psensor_json.c' || echo '$(srcdir)/'`psensor_json.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libpsensor_json_a-psensor_json.Tpo $(DEPDIR)/libpsensor_json_a-psensor_json.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='psensor_json.c' object='libpsensor_json_a-psensor_json.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_json_a_CFLAGS) $(CFLAGS) -c -o libpsensor_json_a-psensor_json.o `test -f 'psensor_json.c' || echo '$(srcdir)/'`psensor_json.c
-
-libpsensor_json_a-psensor_json.obj: psensor_json.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_json_a_CFLAGS) $(CFLAGS) -MT libpsensor_json_a-psensor_json.obj -MD -MP -MF $(DEPDIR)/libpsensor_json_a-psensor_json.Tpo -c -o libpsensor_json_a-psensor_json.obj `if test -f 'psensor_json.c'; then $(CYGPATH_W) 'psensor_json.c'; else $(CYGPATH_W) '$(srcdir)/psensor_json.c'; fi`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libpsensor_json_a-psensor_json.Tpo $(DEPDIR)/libpsensor_json_a-psensor_json.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='psensor_json.c' object='libpsensor_json_a-psensor_json.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_json_a_CFLAGS) $(CFLAGS) -c -o libpsensor_json_a-psensor_json.obj `if test -f 'psensor_json.c'; then $(CYGPATH_W) 'psensor_json.c'; else $(CYGPATH_W) '$(srcdir)/psensor_json.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-noinstLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/libpsensor_json/psensor_json.c b/src/libpsensor_json/psensor_json.c
deleted file mode 100644 (file)
index 129e24c..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
-#include <string.h>
-
-#include "psensor_json.h"
-
-#define ATT_SENSOR_ID "id"
-#define ATT_SENSOR_NAME "name"
-#define ATT_SENSOR_TYPE "type"
-#define ATT_SENSOR_MIN "min"
-#define ATT_SENSOR_MAX "max"
-#define ATT_SENSOR_LAST_MEASURE "last_measure"
-#define ATT_SENSOR_MEASURES "measures"
-#define ATT_MEASURE_VALUE "value"
-#define ATT_MEASURE_TIME "time"
-
-static json_object *
-measure_to_json_object(struct measure *m)
-{
-       json_object *o = json_object_new_object();
-
-       json_object_object_add(o,
-                              ATT_MEASURE_VALUE,
-                              json_object_new_double(m->value.d_num));
-       json_object_object_add(o, ATT_MEASURE_TIME,
-                              json_object_new_int((m->time).tv_sec));
-       return o;
-}
-
-static json_object *
-measures_to_json_object(struct psensor *s)
-{
-       json_object *o;
-       int i;
-
-       o = json_object_new_array();
-
-       for (i = 0; i < s->values_max_length; i++)
-               if (s->measures[i].time.tv_sec)
-                       json_object_array_add
-                               (o, measure_to_json_object(&s->measures[i]));
-
-
-       return o;
-}
-
-static json_object *sensor_to_json(struct psensor *s)
-{
-       json_object *mo, *obj;
-       struct measure *m;
-
-       obj = json_object_new_object();
-
-       json_object_object_add(obj,
-                              ATT_SENSOR_ID,
-                              json_object_new_string(s->id));
-       json_object_object_add(obj,
-                              ATT_SENSOR_NAME,
-                              json_object_new_string(s->name));
-       json_object_object_add(obj,
-                              ATT_SENSOR_TYPE, json_object_new_int(s->type));
-       json_object_object_add(obj,
-                              ATT_SENSOR_MIN, json_object_new_double(s->min));
-       json_object_object_add(obj,
-                              ATT_SENSOR_MAX, json_object_new_double(s->max));
-       json_object_object_add(obj,
-                              ATT_SENSOR_MEASURES,
-                              measures_to_json_object(s));
-
-       m = psensor_get_current_measure(s);
-       mo = json_object_new_object();
-       json_object_object_add(mo,
-                              ATT_MEASURE_VALUE,
-                              json_object_new_double(m->value.d_num));
-       json_object_object_add(mo, ATT_MEASURE_TIME,
-                              json_object_new_int((m->time).tv_sec));
-       json_object_object_add(obj, ATT_SENSOR_LAST_MEASURE, mo);
-
-       return obj;
-}
-
-char *sensor_to_json_string(struct psensor *s)
-{
-       char *str;
-       json_object *obj = sensor_to_json(s);
-
-       str = strdup(json_object_to_json_string(obj));
-
-       json_object_put(obj);
-
-       return str;
-}
-
-char *sensors_to_json_string(struct psensor **sensors)
-{
-       struct psensor **sensors_cur;
-       char *str;
-       json_object *obj = json_object_new_array();
-
-       sensors_cur = sensors;
-
-       while (*sensors_cur) {
-               struct psensor *s = *sensors_cur;
-
-               json_object_array_add(obj, sensor_to_json(s));
-
-               sensors_cur++;
-       }
-
-       str = strdup(json_object_to_json_string(obj));
-
-       json_object_put(obj);
-
-       return str;
-}
-
diff --git a/src/libpsensor_json/psensor_json.h b/src/libpsensor_json/psensor_json.h
deleted file mode 100644 (file)
index cde92f0..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
-#ifndef _PSENSOR_PSENSOR_JSON_H_
-#define _PSENSOR_PSENSOR_JSON_H_
-
-#include <json/json.h>
-
-#include "psensor.h"
-
-char *sensor_to_json_string(struct psensor *s);
-char *sensors_to_json_string(struct psensor **sensors);
-
-#endif
index 1ef3750..9ab2c10 100644 (file)
@@ -4,7 +4,6 @@ psensor_server_SOURCES = server.c server.h
 AM_CPPFLAGS = -pedantic -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/libpsensor_json \
        $(SENSORS_CFLAGS)\
        $(JSON_CFLAGS)\
        $(LIBMICROHTTPD_CFLAGS)
@@ -13,7 +12,6 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 LIBS = \
        ../lib/libpsensor.a \
-       ../libpsensor_json/libpsensor_json.a \
        $(SENSORS_LIBS) \
        $(JSON_LIBS) \
        $(LIBMICROHTTPD_LIBS)
index 794f6c7..ca6c408 100644 (file)
@@ -147,9 +147,8 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@
 LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
 LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
 LIBOBJS = @LIBOBJS@
-LIBS = ../lib/libpsensor.a ../libpsensor_json/libpsensor_json.a \
-       $(SENSORS_LIBS) $(JSON_LIBS) $(LIBMICROHTTPD_LIBS) \
-       $(am__append_2)
+LIBS = ../lib/libpsensor.a $(SENSORS_LIBS) $(JSON_LIBS) \
+       $(LIBMICROHTTPD_LIBS) $(am__append_2)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -243,9 +242,8 @@ top_srcdir = @top_srcdir@
 psensor_server_SOURCES = server.c server.h $(am__append_3)
 AM_CPPFLAGS = -pedantic -Wall -Werror \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/libpsensor_json \
-       $(SENSORS_CFLAGS) $(JSON_CFLAGS) $(LIBMICROHTTPD_CFLAGS) \
-       $(am__append_1)
+       -I$(top_srcdir)/src/lib $(SENSORS_CFLAGS) $(JSON_CFLAGS) \
+       $(LIBMICROHTTPD_CFLAGS) $(am__append_1)
 @GTOP_TRUE@AM_LDFLAGS = -Wl,--as-needed
 dist_man_MANS = psensor-server.1
 EXTRA_DIST = description.txt