IKEv2 plugin export fixes

Change-Id: If6b0edb0dd242e0ef6953c8f4c1826eb80b9e1cc
Signed-off-by: Neale Ranns <nranns@cisco.com>

3 files changed, 24 insertions, 7 deletions

diff --git a/src/plugins/ikev2/CMakeLists.txt b/src/plugins/ikev2/CMakeLists.txt
index 800b9a8d67e..d3ba271f3ad 100644
--- a/src/plugins/ikev2/CMakeLists.txt
+++ b/src/plugins/ikev2/CMakeLists.txt
@@ -29,6 +29,6 @@ add_vpp_plugin(ikev2
   INSTALL_HEADERS
   ikev2.h
   ikev2_priv.h
-
-  COMPONENT vpp-plugin-ikev2
+  ikev2_msg_enum.h
+  ikev2_all_api.h
 )
diff --git a/src/plugins/ikev2/ikev2_all_api.h b/src/plugins/ikev2/ikev2_all_api.h
new file mode 100644
index 00000000000..2ab112a7ea6
--- /dev/null
+++ b/src/plugins/ikev2/ikev2_all_api.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <ikev2/ikev2.api.h>
+
diff --git a/src/plugins/ikev2/ikev2_api.c b/src/plugins/ikev2/ikev2_api.c
index ace28c5aa20..b7b8d6ddcee 100644
--- a/src/plugins/ikev2/ikev2_api.c
+++ b/src/plugins/ikev2/ikev2_api.c
@@ -29,22 +29,22 @@
 #include <plugins/ikev2/ikev2_msg_enum.h>
 
 #define vl_typedefs		/* define message structures */
-#include <ikev2/ikev2.api.h>
+#include <ikev2/ikev2_all_api.h>
 #undef vl_typedefs
 
 #define vl_endianfun		/* define message structures */
-#include <ikev2/ikev2.api.h>
+#include <ikev2/ikev2_all_api.h>
 #undef vl_endianfun
 
 /* instantiate all the print functions we know about */
 #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
 #define vl_printfun
-#include <ikev2/ikev2.api.h>
+#include <ikev2/ikev2_all_api.h>
 #undef vl_printfun
 
 /* Get the API version number */
 #define vl_api_version(n,v) static u32 api_version=(v);
-#include <ikev2/ikev2.api.h>
+#include <ikev2/ikev2_all_api.h>
 #undef vl_api_version
 
 extern ikev2_main_t ikev2_main;
@@ -405,7 +405,7 @@ static void
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
 #define vl_msg_name_crc_list
-#include <ikev2/ikev2.api.h>
+#include <ikev2/ikev2_all_api.h>
 #undef vl_msg_name_crc_list
 
 static void