Fix JSON library import and linking

Corymbia · Nov 15, 2018 · c43503f · c43503f
1 parent 2eafb16
commit c43503f
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/cluster/Makefile b/cluster/Makefile
@@ -91,7 +91,7 @@ VNLIBS= ../util/euca_network.o ../util/log.o ../util/fault.o ../util/wc.o ../uti
 WSSECLIBS=../util/euca_axis.o ../util/euca_auth.o
 CC_LIBS = ../util/config.o ${LIBS} ${LDFLAGS} -lcurl -lssl -lcrypto -lrampart
 STATS_OBJS= ../util/stats/stats.o ../util/stats/sensor_common.o ../util/stats/message_sensor.o ../util/stats/service_sensor.o ../util/stats/fs_emitter.o ../util/stats/message_stats.o
-STATS_LIBS=-ljson -ljson-c -lm
+STATS_LIBS=-ljson-c -lm
 CFLAGS += 
 
 all: generated/stubs

diff --git a/cluster/handlers.c b/cluster/handlers.c
@@ -66,7 +66,7 @@
 #include <signal.h>
 #include <math.h>
 #include <assert.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 #include <eucalyptus.h>
 #include "axis2_skel_EucalyptusCC.h"

diff --git a/net/Makefile b/net/Makefile
@@ -72,7 +72,7 @@
 include ../Makedefs
 
 # Standard Libraries, Dependencies and Includes
-STDLIBS      := -lpthread -lm -lssl -lxml2 -lcurl -lcrypto -ljson -ljson-c
+STDLIBS      := -lpthread -lm -lssl -lxml2 -lcurl -lcrypto -ljson-c
 STDDEPS      := ../util/sequence_executor.o ../util/atomic_file.o ../util/log.o ../util/ipc.o ../util/misc.o  
 STDDEPS      += ../util/euca_string.o ../util/euca_file.o ../util/hash.o ../util/fault.o ../util/wc.o ../util/utf8.o  
 STDDEPS      += ../util/euca_auth.o ../storage/diskutil.o ../storage/http.o ../util/config.o ../util/euca_network.o

diff --git a/net/euca-to-mido.c b/net/euca-to-mido.c
@@ -52,7 +52,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <curl/curl.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 #include <eucalyptus.h>
 #include <misc.h>

diff --git a/net/midonet-api.c b/net/midonet-api.c
@@ -51,7 +51,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <curl/curl.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 #include <pthread.h>
 

diff --git a/node/Makefile b/node/Makefile
@@ -92,7 +92,7 @@ NET_LIB = ../net/libeucanet.a
 NC_HANDLERS=handlers_xen.o handlers_kvm.o handlers_default.o xml.o hooks.o
 STORAGE_OBJS=../storage/backing.o ../storage/diskutil.o ../storage/blobstore.o ../storage/objectstorage.o ../storage/vbr.o ../storage/iscsi.o ../storage/ebs_utils.o ../storage/sc-client-marshal-adb.o ../storage/storage-controller.o
 STATS_OBJS = ../util/stats/stats.o ../util/stats/sensor_common.o ../util/stats/message_sensor.o ../util/stats/service_sensor.o ../util/stats/fs_emitter.o ../util/stats/message_stats.o
-STATS_LIBS = -ljson -ljson-c -lm
+STATS_LIBS = -ljson-c -lm
 CFLAGS += 
 
 BUILD_ID=-DEUCA_COMPILE_TIMESTAMP=\""[built `date --rfc-3339='sec'`]"\"

diff --git a/util/stats/Makefile b/util/stats/Makefile
@@ -41,7 +41,7 @@ include ../../Makedefs
 
 TEST_OBJS=../config.o ../ipc.o ../misc.o ../wc.o ../log.o ../euca_string.o ../euca_file.o ../../storage/diskutil.o
 STATS_OBJS=../config.o ../ipc.o ../misc.o ../wc.o ../log.o ../euca_string.o ../euca_file.o ../../storage/diskutil.o
-STATS_LIBS = -ljson -lm
+STATS_LIBS = -ljson-c -lm
 EFENCE=-lefence
 #DEBUGS = -DDEBUG # -DDEBUG1
 all: sensor_common.o stats.o message_stats.o message_sensor.o fs_emitter.o service_sensor.o 

diff --git a/util/stats/fs_emitter.c b/util/stats/fs_emitter.c
@@ -60,7 +60,7 @@
 #include <diskutil.h>
 #include <log.h>
 #include <stdio.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/util/stats/fs_emitter.h b/util/stats/fs_emitter.h
@@ -53,7 +53,7 @@
  |                                  INCLUDES                                  |
  |                                                                            |
 \*----------------------------------------------------------------------------*/
-#include <json/json.h>
+#include <json-c/json.h>
 #include <grp.h>
 
 /*----------------------------------------------------------------------------*\

diff --git a/util/stats/message_sensor.h b/util/stats/message_sensor.h
@@ -54,7 +54,7 @@
  |                                  INCLUDES                                  |
  |                                                                            |
 \*----------------------------------------------------------------------------*/
-#include <json/json.h>
+#include <json-c/json.h>
 #include <sensor_common.h>
 
 /*----------------------------------------------------------------------------*\

diff --git a/util/stats/message_stats.c b/util/stats/message_stats.c
@@ -56,7 +56,7 @@
 #include <string.h>
 #include <log.h>
 #include <ipc.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #include <math.h>
 
 /*----------------------------------------------------------------------------*\

diff --git a/util/stats/message_stats.h b/util/stats/message_stats.h
@@ -54,7 +54,7 @@
  |                                  INCLUDES                                  |
  |                                                                            |
 \*----------------------------------------------------------------------------*/
-#include <json/json.h>
+#include <json-c/json.h>
 
 /*----------------------------------------------------------------------------*\
  |                                                                            |

diff --git a/util/stats/sensor_common.c b/util/stats/sensor_common.c
@@ -54,7 +54,7 @@
 #include "sensor_common.h"
 #include <eucalyptus.h>
 #include <log.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #include <stdarg.h>
 
 /*----------------------------------------------------------------------------*\

diff --git a/util/stats/sensor_common.h b/util/stats/sensor_common.h
@@ -54,7 +54,7 @@
  |                                                                            |
 \*----------------------------------------------------------------------------*/
 #include <time.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 
 /*----------------------------------------------------------------------------*\

diff --git a/util/stats/service_sensor.h b/util/stats/service_sensor.h
@@ -54,7 +54,7 @@
  |                                                                            |
 \*----------------------------------------------------------------------------*/
 #include "sensor_common.h"
-#include <json/json.h>
+#include <json-c/json.h>
 
 /*----------------------------------------------------------------------------*\
  |                                                                            |

diff --git a/util/stats/stats.h b/util/stats/stats.h
@@ -56,7 +56,7 @@
  |                                  INCLUDES                                  |
  |                                                                            |
 \*----------------------------------------------------------------------------*/
-#include <json/json.h>
+#include <json-c/json.h>
 #include "sensor_common.h"
 #include <ipc.h>