X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvpp%2FCMakeLists.txt;h=8f7c2cfafb2650285c66cd8bf41b300d389f4f6e;hb=dc20371f83ed81462c0b24eb750b76f7819df64a;hp=6f58e8db8ecd98ab964dd30910a5480b96839d74;hpb=4c64b6edc86f7732f4a160b948b3386e4021a265;p=vpp.git

diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt
index 6f58e8db8ec..8f7c2cfafb2 100644
--- a/src/vpp/CMakeLists.txt
+++ b/src/vpp/CMakeLists.txt
@@ -34,18 +34,20 @@ add_custom_target(vpp_version_h
 option(VPP_API_TEST_BUILTIN "Use builtin VPP API test." ON)
 
 set(VPP_API_FILES
+  api/vpe_types.api
   api/vpe.api
-  stats/stats.api
-  oam/oam.api
 )
 
-vpp_add_api_files(vpp ${VPP_API_FILES})
+vpp_add_api_files(vpp core vpp ${VPP_API_FILES})
 
 foreach(file ${VPP_API_FILES})
   get_filename_component(dir ${file} DIRECTORY)
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h
+    ${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h
     DESTINATION include/vpp/${dir}
+    COMPONENT vpp-dev
   )
 endforeach()
 
@@ -53,13 +55,11 @@ set(VPP_SOURCES
   vnet/main.c
   app/vpe_cli.c
   app/version.c
-  oam/oam.c
-  oam/oam_api.c
-  stats/stats.c
   stats/stat_segment.c
   api/api.c
   api/json_format.c
   api/custom_dump.c
+  api/types.c
 )
 
 if(VPP_API_TEST_BUILTIN)
@@ -67,6 +67,7 @@ if(VPP_API_TEST_BUILTIN)
     api/api_format.c
     api/api_main.c
     api/plugin.c
+    api/types.c
   )
   add_definitions(-DVPP_API_TEST_BUILTIN=1)
 endif()
@@ -81,6 +82,8 @@ add_vpp_executable(vpp
 add_vpp_headers(vpp
   api/vpe_msg_enum.h
   api/vpe_all_api_h.h
+  stats/stat_segment.h
+  stats/stat_segment_shared.h
 )
 
 ##############################################################################
@@ -103,15 +106,17 @@ add_vpp_executable(vpp_get_metrics
 ##############################################################################
 # stats binaries
 ##############################################################################
-add_vpp_executable(summary_stats_client
-  SOURCES api/summary_stats_client.c
-  LINK_LIBRARIES vppinfra svm vlibmemoryclient
+add_vpp_executable(vpp_get_stats
+  SOURCES app/vpp_get_stats.c
+  LINK_LIBRARIES vppapiclient vppinfra
   DEPENDS api_headers
 )
 
-add_vpp_executable(stat_client
-  SOURCES app/stat_client.c
-  LINK_LIBRARIES vppinfra svm vlibmemoryclient
+add_vpp_executable(vpp_prometheus_export
+  SOURCES app/vpp_prometheus_export.c
+  LINK_LIBRARIES vppapiclient vppinfra svm vlibmemoryclient
   DEPENDS api_headers
 )
 
+install(FILES conf/startup.conf DESTINATION etc/vpp COMPONENT vpp)
+install(FILES conf/80-vpp.conf DESTINATION etc/sysctl.d COMPONENT vpp)