diff options
| author |   Deepak S <deepak.s@linux.intel.com> | 2018-06-12 21:07:59 +0530 |
|---|---|---|
| committer | Deepak S <deepak.s@linux.intel.com> | 2018-06-12 21:08:10 +0530 |
| commit | ca5ac3a8b9b3c148ce783749c0243da3ecbdfe98 (patch) | |
| tree | 4f0ec59a0b1a2a611c4c796980c5fdbb82db132b /VNFs | |
| parent | a9d9979b1f5b7435552ae884da69220a42b81f81 (diff) | |
Adding support for Ubuntu 17.10...
Change-Id: I9a9da79cb4ccb245ccb38b50b561da51a40a359d
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Diffstat (limited to 'VNFs')
| -rw-r--r-- | VNFs/vACL/Makefile | 2 | ||||
| -rw-r--r-- | VNFs/vACL/pipeline/pipeline_acl.h | 2 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/Makefile | 2 | ||||
| -rw-r--r-- | VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h | 2 | ||||
| -rw-r--r-- | VNFs/vFW/Makefile | 2 | ||||
| -rw-r--r-- | VNFs/vFW/pipeline/pipeline_vfw.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/VNFs/vACL/Makefile b/VNFs/vACL/Makefile index 0995f905..bf1502a2 100644 --- a/VNFs/vACL/Makefile +++ b/VNFs/vACL/Makefile @@ -66,7 +66,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway TOP = $(RTE_SDK)/../civetweb CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 CFLAGS += -DREST_API_SUPPORT -LDFLAGS += -ljson -lcrypto -lssl +LDFLAGS += -ljson-c -lcrypto -lssl LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb # all source are stored in SRCS-y diff --git a/VNFs/vACL/pipeline/pipeline_acl.h b/VNFs/vACL/pipeline/pipeline_acl.h index 93b92c45..a0ff84da 100644 --- a/VNFs/vACL/pipeline/pipeline_acl.h +++ b/VNFs/vACL/pipeline/pipeline_acl.h @@ -29,7 +29,7 @@ #include "pipeline.h" #include "pipeline_acl_be.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> /* ACL IPV4 and IPV6 enable flags for debugging (Default both on) */ extern int acl_ipv4_enabled; diff --git a/VNFs/vCGNAPT/Makefile b/VNFs/vCGNAPT/Makefile index 41cacfb7..82efa769 100644 --- a/VNFs/vCGNAPT/Makefile +++ b/VNFs/vCGNAPT/Makefile @@ -68,7 +68,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway TOP = $(RTE_SDK)/../civetweb CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 CFLAGS += -DREST_API_SUPPORT -LDFLAGS += -ljson -lcrypto -lssl +LDFLAGS += -ljson-c -lcrypto -lssl LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb # all source are stored in SRCS-y diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h index 6497de27..d61273f0 100644 --- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h +++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h @@ -29,7 +29,7 @@ #include "pipeline.h" #include "pipeline_cgnapt_common.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> /** * Add NAPT rule to the NAPT rule table. diff --git a/VNFs/vFW/Makefile b/VNFs/vFW/Makefile index b011eca2..80dd91ad 100644 --- a/VNFs/vFW/Makefile +++ b/VNFs/vFW/Makefile @@ -68,7 +68,7 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/gateway TOP = $(RTE_SDK)/../civetweb CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1 -DREST_API_SUPPORT=1 -LDFLAGS += -ljson -lcrypto -lssl +LDFLAGS += -ljson-c -lcrypto -lssl LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb # all source are stored in SRCS-y diff --git a/VNFs/vFW/pipeline/pipeline_vfw.h b/VNFs/vFW/pipeline/pipeline_vfw.h index 96e7ad33..7cfc95c3 100644 --- a/VNFs/vFW/pipeline/pipeline_vfw.h +++ b/VNFs/vFW/pipeline/pipeline_vfw.h @@ -31,7 +31,7 @@ #include "pipeline_vfw_be.h" #include <civetweb.h> -#include <json/json.h> +#include <json-c/json.h> /* VFW IPV4 and IPV6 enable flags for debugging (Default both on) */ extern int vfw_ipv4_enabled; |