cmake: Fix plugins .h includes

[vpp.git] / src / plugins / ioam.am

diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am
index d381641..88439ad 100644 (file)
--- a/src/plugins/ioam.am
+++ b/src/plugins/ioam.am
@@ -32,12 +32,6 @@ IOAM_POT_NOINST_HDR =                                \
 
 IOAM_POT_API = ioam/lib-pot/pot.api
 
-ioam_pot_test_plugin_la_SOURCES =              \
-       ioam/lib-pot/pot_test.c                 \
-       ioam/lib-pot/pot_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_pot_test_plugin.la
-
 ########################################
 # iOAM trace export for IPv6
 ########################################
@@ -55,36 +49,27 @@ IOAM_EXPORT_NOINST_HDR =                \
 
 IOAM_EXPORT_API = ioam/export/ioam_export.api
 
-ioam_export_test_plugin_la_SOURCES =  \
-  ioam/export/ioam_export_test.c      \
-  ioam/export/ioam_export_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_export_test_plugin.la
-
 ########################################
 # iOAM Trace
 ########################################
 IOAM_TRACE_SRC =                               \
        ioam/lib-trace/trace_util.c             \
        ioam/encap/ip6_ioam_trace.c             \
-       ioam/lib-trace/trace_util.h             \
        ioam/lib-trace/trace_api.c
 
 IOAM_TRACE_NOINST_HDR =                 \
-  ioam/export/ioam_export_all_api_h.h   \
   ioam/lib-trace/trace_all_api_h.h     \
   ioam/lib-trace/trace_msg_enum.h      \
   ioam/lib-trace/trace.api.h           \
   ioam/lib-trace/trace_util.h          \
-  ioam/encap/ip6_ioam_trace.h
+  ioam/encap/ip6_ioam_trace.h          \
+  ioam/lib-trace/trace_config.h
 
 IOAM_TRACE_API = ioam/lib-trace/trace.api
 
-ioam_trace_test_plugin_la_SOURCES =            \
-       ioam/lib-trace/trace_test.c             \
-       ioam/lib-trace/trace_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la
+nobase_include_HEADERS +=                       \
+       ioam/lib-trace/trace_util.h             \
+       ioam/export-common/ioam_export.h
 
 ########################################
 # VxLAN-GPE
@@ -103,7 +88,6 @@ IOAM_VXLAN_GPE_SRC =                                 \
        ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
 
 IOAM_VXLAN_GPE_NOINST_HDR =                                    \
-  ioam/export/ioam_export_all_api_h.h                          \
   ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h                     \
   ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h                      \
   ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api.h                      \
@@ -117,18 +101,6 @@ IOAM_VXLAN_GPE_NOINST_HDR =                                \
 IOAM_VXLAN_GPE_API  = ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api
 IOAM_VXLAN_GPE_API += ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api
 
-ioam_vxlan_gpe_test_plugin_la_SOURCES =                \
-       ioam/lib-vxlan-gpe/vxlan_gpe_test.c                     \
-       ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += ioam_vxlan_gpe_test_plugin.la
-
-vxlan_gpe_ioam_export_test_plugin_la_SOURCES =          \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c      \
-  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h
-
-vppapitestplugins_LTLIBRARIES += vxlan_gpe_ioam_export_test_plugin.la
-
 ########################################
 # iOAM E2E
 ########################################
@@ -199,13 +171,6 @@ UDP_PING_NOINST_HDR =                                  \
        ioam/udp-ping/udp_ping.api.h
 
 UDP_PING_API = ioam/udp-ping/udp_ping.api
-
-udp_ping_test_plugin_la_SOURCES =              \
-       ioam/udp-ping/udp_ping_test.c                   \
-       ioam/udp-ping/udp_ping_plugin.api.h  
-
-vppapitestplugins_LTLIBRARIES += udp_ping_test_plugin.la
- 
 ########################################
 # iOAM plugins
 ########################################
@@ -229,7 +194,7 @@ API_FILES +=                                            \
         $(IOAM_IP6_MANYCAST_API)        \
                $(UDP_PING_API)
 
-noinst_HEADERS +=                               \
+nobase_apiinclude_HEADERS +=                               \
         $(IOAM_POT_NOINST_HDR)                  \
         $(IOAM_EXPORT_NOINST_HDR)               \
         $(IOAM_TRACE_NOINST_HDR)                \
@@ -240,4 +205,25 @@ noinst_HEADERS +=                               \
 
 vppplugins_LTLIBRARIES += ioam_plugin.la
 
+########################################
+# iOAM plugins
+########################################
+
+ioam_test_plugin_la_SOURCES = \
+  ioam/ioam_test.c                                             \
+  ioam/lib-pot/pot_test.c                                      \
+  ioam/lib-pot/pot_plugin.api.h                                        \
+  ioam/lib-trace/trace_test.c                                  \
+  ioam/lib-trace/trace_plugin.api.h                            \
+  ioam/export/ioam_export_test.c                               \
+  ioam/export/ioam_export_plugin.api.h                         \
+  ioam/lib-vxlan-gpe/vxlan_gpe_test.c                          \
+  ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h                    \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c           \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h     \
+  ioam/udp-ping/udp_ping_test.c                                        \
+  ioam/udp-ping/udp_ping_plugin.api.h
+
+vppapitestplugins_LTLIBRARIES += ioam_test_plugin.la
+
 # vi:syntax=automake