From c43503fa84e2d24070fd59216c6870db5aac7dd3 Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Tue, 6 Nov 2018 00:50:00 -0800 Subject: [PATCH] Fix JSON library import and linking --- cluster/Makefile | 2 +- cluster/handlers.c | 2 +- net/Makefile | 2 +- net/euca-to-mido.c | 2 +- net/midonet-api.c | 2 +- node/Makefile | 2 +- util/stats/Makefile | 2 +- util/stats/fs_emitter.c | 2 +- util/stats/fs_emitter.h | 2 +- util/stats/message_sensor.h | 2 +- util/stats/message_stats.c | 2 +- util/stats/message_stats.h | 2 +- util/stats/sensor_common.c | 2 +- util/stats/sensor_common.h | 2 +- util/stats/service_sensor.h | 2 +- util/stats/stats.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cluster/Makefile b/cluster/Makefile index 3dce24abe54..d0051cadf1f 100644 --- 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 index f76680a1c13..4ba1e1e0cb8 100644 --- a/cluster/handlers.c +++ b/cluster/handlers.c @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include "axis2_skel_EucalyptusCC.h" diff --git a/net/Makefile b/net/Makefile index 517c1d6bf66..e8779049e73 100644 --- 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 index fe040824d34..0e618cc9d07 100644 --- a/net/euca-to-mido.c +++ b/net/euca-to-mido.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include diff --git a/net/midonet-api.c b/net/midonet-api.c index 9429d4a87a8..f9ccd5b00c6 100644 --- a/net/midonet-api.c +++ b/net/midonet-api.c @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include diff --git a/node/Makefile b/node/Makefile index 42068fc0180..0d2966b2e51 100644 --- 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 index 51117c56417..b3041139869 100644 --- 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 index c88bf276d9a..ad987510111 100644 --- a/util/stats/fs_emitter.c +++ b/util/stats/fs_emitter.c @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/util/stats/fs_emitter.h b/util/stats/fs_emitter.h index cb40739d779..52d072a6105 100644 --- a/util/stats/fs_emitter.h +++ b/util/stats/fs_emitter.h @@ -53,7 +53,7 @@ | INCLUDES | | | \*----------------------------------------------------------------------------*/ -#include +#include #include /*----------------------------------------------------------------------------*\ diff --git a/util/stats/message_sensor.h b/util/stats/message_sensor.h index 234a70ed118..1e2ce1b9195 100644 --- a/util/stats/message_sensor.h +++ b/util/stats/message_sensor.h @@ -54,7 +54,7 @@ | INCLUDES | | | \*----------------------------------------------------------------------------*/ -#include +#include #include /*----------------------------------------------------------------------------*\ diff --git a/util/stats/message_stats.c b/util/stats/message_stats.c index 6a6652c5d6f..25c2125e096 100644 --- a/util/stats/message_stats.c +++ b/util/stats/message_stats.c @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include /*----------------------------------------------------------------------------*\ diff --git a/util/stats/message_stats.h b/util/stats/message_stats.h index 810c7f1d34b..34d56a419f5 100644 --- a/util/stats/message_stats.h +++ b/util/stats/message_stats.h @@ -54,7 +54,7 @@ | INCLUDES | | | \*----------------------------------------------------------------------------*/ -#include +#include /*----------------------------------------------------------------------------*\ | | diff --git a/util/stats/sensor_common.c b/util/stats/sensor_common.c index de917388943..aa132651bd5 100644 --- a/util/stats/sensor_common.c +++ b/util/stats/sensor_common.c @@ -54,7 +54,7 @@ #include "sensor_common.h" #include #include -#include +#include #include /*----------------------------------------------------------------------------*\ diff --git a/util/stats/sensor_common.h b/util/stats/sensor_common.h index 0cfd8e4724d..214ec556eea 100644 --- a/util/stats/sensor_common.h +++ b/util/stats/sensor_common.h @@ -54,7 +54,7 @@ | | \*----------------------------------------------------------------------------*/ #include -#include +#include /*----------------------------------------------------------------------------*\ diff --git a/util/stats/service_sensor.h b/util/stats/service_sensor.h index 098d1ae65c2..7cd070b0cba 100644 --- a/util/stats/service_sensor.h +++ b/util/stats/service_sensor.h @@ -54,7 +54,7 @@ | | \*----------------------------------------------------------------------------*/ #include "sensor_common.h" -#include +#include /*----------------------------------------------------------------------------*\ | | diff --git a/util/stats/stats.h b/util/stats/stats.h index fe48f7020a5..d893fb5d092 100644 --- a/util/stats/stats.h +++ b/util/stats/stats.h @@ -56,7 +56,7 @@ | INCLUDES | | | \*----------------------------------------------------------------------------*/ -#include +#include #include "sensor_common.h" #include