From 5a2946c6174f91032792b8e4978c8d235f2281f0 Mon Sep 17 00:00:00 2001
From: "Keith Burns (alagalah)" <alagalah@gmail.com>
Date: Fri, 2 Feb 2018 08:21:56 -0800
Subject: [PATCH] Clean up for vcl.am, making vppcom.h C++ aware

Change-Id: I2548ebd37e16bed50b5c8046b728415a341413e3
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
---
 src/vcl.am       | 19 +++++++++----------
 src/vcl/vppcom.h | 13 +++++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/vcl.am b/src/vcl.am
index 642cb351588..eac3d7e48cb 100644
--- a/src/vcl.am
+++ b/src/vcl.am
@@ -16,28 +16,27 @@ lib_LTLIBRARIES += libvppcom.la libvcl_ldpreload.la
 libvppcom_la_SOURCES =
 libvcl_ldpreload_la_SOURCES =
 libvppcom_la_DEPENDENCIES = 	\
-	libvppinfra.la		\
-	libvlib.la		\
 	libsvm.la 		\
 	libvlibmemoryclient.la
 
-libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt
-libvcl_ldpreload_la_LIBADD = -lpthread -lrt -ldl
+libvppcom_la_LIBADD = $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl
 
 libvppcom_la_SOURCES +=				\
-  vcl/vppcom.c
+  vcl/vppcom.c					\
+  $(libvppinfra_la_SOURCES)			\
+  $(libvlib_la_SOURCES)				\
+  $(libsvm_la_SOURCES)				\
+  $(libvlibmemoryclient_la_SOURCES)
 
 nobase_include_HEADERS +=			\
   vcl/vppcom.h
 
+libvcl_ldpreload_la_LIBADD =  $(libvppcom_la_DEPENDENCIES) -lpthread -lrt -ldl
+
 libvcl_ldpreload_la_SOURCES +=			\
   vcl/vcom_socket_wrapper.c			\
   vcl/vcom.c					\
-  $(libvppcom_la_SOURCES)			\
-  $(libvppinfra_la_SOURCES)			\
-  $(libvlib_la_SOURCES)				\
-  $(libsvm_la_SOURCES)				\
-  $(libvlibmemoryclient_la_SOURCES)
+  $(libvppcom_la_SOURCES)
 
 nobase_include_HEADERS +=			\
   vcl/vcom_socket_wrapper.h			\
diff --git a/src/vcl/vppcom.h b/src/vcl/vppcom.h
index 208b3717d03..c79b90c7992 100644
--- a/src/vcl/vppcom.h
+++ b/src/vcl/vppcom.h
@@ -21,6 +21,13 @@
 #include <sys/poll.h>
 #include <sys/epoll.h>
 
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* *INDENT-ON* */
+
 /*
  * VPPCOM Public API Definitions, Enums, and Data Structures
  */
@@ -244,6 +251,12 @@ extern int vppcom_session_sendto (uint32_t session_index, void *buffer,
 extern int vppcom_poll (vcl_poll_t * vp, uint32_t n_sids,
 			double wait_for_time);
 
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
 #endif /* included_vppcom_h */
 
 /*
-- 
2.16.6