Revert of legacy name (Xilinx#2235)

sjmoneill · Oct 10, 2019 · 0a3bb7a · 0a3bb7a
1 parent a12d4d6
commit 0a3bb7a
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 24 deletions.
diff --git a/src/CMake/config/libxmaapi_legacy.pc.in → src/CMake/config/libxmaapi.pc.in b/src/CMake/config/libxmaapi_legacy.pc.in → src/CMake/config/libxmaapi.pc.in
@@ -10,5 +10,5 @@ Version: 0.0.1
 Requires: yaml-0.1   >= 0.1.4 \
           libxml-2.0 >= 2.9.1 \
           xrt >= 2.1.0
-Libs: -L${libdir} -lxmaapi_legacy
-Cflags: -I${includedir1} -I${includedir2}
+Libs: -L${libdir} -lxmaapi
+Cflags: -I${includedir2}
diff --git a/src/CMake/config/libxmaplugin_legacy.pc.in → src/CMake/config/libxmaplugin.pc.in b/src/CMake/config/libxmaplugin_legacy.pc.in → src/CMake/config/libxmaplugin.pc.in
@@ -8,5 +8,5 @@ Name: libxmaplugin
 Description: Xilinx Media Accelerator Plugin API
 Version: 0.0.1
 Requires:
-Libs: -L${libdir}  -lxmaplugin_legacy 
-Cflags: -I${includedir1} -I${includedir2}
+Libs: -L${libdir}  -lxmaplugin
+Cflags: -I${includedir2}
diff --git a/src/CMake/pkgconfig.cmake b/src/CMake/pkgconfig.cmake
@@ -33,25 +33,25 @@ install (
   )
 
 configure_file (
-  ${CMAKE_SOURCE_DIR}/CMake/config/libxmaapi_legacy.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/libxmaapi_legacy.pc
+  ${CMAKE_SOURCE_DIR}/CMake/config/libxmaapi.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/libxmaapi.pc
   @ONLY
   )
 install (
   FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/libxmaapi_legacy.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/libxmaapi.pc
   DESTINATION
   ${XRT_PKG_CONFIG_DIR}
   )
 
 configure_file (
-  ${CMAKE_SOURCE_DIR}/CMake/config/libxmaplugin_legacy.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/libxmaplugin_legacy.pc
+  ${CMAKE_SOURCE_DIR}/CMake/config/libxmaplugin.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/libxmaplugin.pc
   @ONLY
   )
 install (
   FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/libxmaplugin_legacy.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/libxmaplugin.pc
   DESTINATION
   ${XRT_PKG_CONFIG_DIR}
   )

diff --git a/src/xma/xma_legacy/CMakeLists.txt b/src/xma/xma_legacy/CMakeLists.txt
@@ -20,4 +20,4 @@ set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
 
 #Install all header files with directory structure
 #Don't remove trailing/ in include/
-install(DIRECTORY include/ DESTINATION ${XMA_INSTALL_DIR}/include/xma_legacy)
+install(DIRECTORY include/ DESTINATION ${XMA_INSTALL_DIR}/include)
diff --git a/src/xma/xma_legacy/src/xmaapi/CMakeLists.txt b/src/xma/xma_legacy/src/xmaapi/CMakeLists.txt
@@ -20,18 +20,18 @@ if(NOT XML2_LIB_INCLUDE)
   MESSAGE("xml2 include path: ${XML2_LIB_INCLUDE}")
 endif()
 
-add_library(xmaapi_legacy SHARED ${XMA_API_ALL_SRC})
-target_include_directories(xmaapi_legacy PRIVATE
+add_library(xmaapi SHARED ${XMA_API_ALL_SRC})
+target_include_directories(xmaapi PRIVATE
   "${OPENCL_INCLUDEDIR}"
   "${XML2_LIB_INCLUDE}")
 #  "/usr/include/libxml2"
 
-set_target_properties(xmaapi_legacy PROPERTIES VERSION ${XMA_VERSION_STRING}
+set_target_properties(xmaapi PROPERTIES VERSION ${XMA_VERSION_STRING}
   SOVERSION ${XMA_SOVERSION})
 
 #target_link_libraries(xmaapi "${XML2_LIB}")
 #removed xrt_core lib as name is different for aws and xbb
-target_link_libraries(xmaapi_legacy
+target_link_libraries(xmaapi
   m
   dl
   gcc_s
@@ -40,7 +40,7 @@ target_link_libraries(xmaapi_legacy
   yaml
   )
 
-install(TARGETS xmaapi_legacy LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib)
+install(TARGETS xmaapi LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib)
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libxmaapi.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libxmaapi.pc @ONLY)
 #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libxmaapi.pc DESTINATION ${XMA_INSTALL_DIR}/lib/pkgconfig)
diff --git a/src/xma/xma_legacy/src/xmaapi/xmadecoder.cpp b/src/xma/xma_legacy/src/xmaapi/xmadecoder.cpp
@@ -39,7 +39,7 @@ xma_dec_plugins_load(XmaSystemCfg      *systemcfg,
 
     xma_logmsg(XMA_DEBUG_LOG, XMA_DECODER_MOD, "%s()\n", __func__);
     // Load the xmaplugin library as it is a dependency for all plugins
-    void *xmahandle = dlopen("libxmaplugin_legacy.so",
+    void *xmahandle = dlopen("libxmaplugin.so",
                              RTLD_LAZY | RTLD_GLOBAL);
     if (!xmahandle)
     {

diff --git a/src/xma/xma_legacy/src/xmaapi/xmaencoder.cpp b/src/xma/xma_legacy/src/xmaapi/xmaencoder.cpp
@@ -80,7 +80,7 @@ xma_enc_plugins_load(XmaSystemCfg      *systemcfg,
 
     xma_logmsg(XMA_DEBUG_LOG, XMA_ENCODER_MOD, "%s()\n", __func__);
     // Load the xmaplugin library as it is a dependency for all plugins
-    void *xmahandle = dlopen("libxmaplugin_legacy.so",
+    void *xmahandle = dlopen("libxmaplugin.so",
                              RTLD_LAZY | RTLD_GLOBAL);
     if (!xmahandle)
     {

diff --git a/src/xma/xma_legacy/src/xmaapi/xmafilter.cpp b/src/xma/xma_legacy/src/xmaapi/xmafilter.cpp
@@ -38,7 +38,7 @@ xma_filter_plugins_load(XmaSystemCfg      *systemcfg,
 
     xma_logmsg(XMA_DEBUG_LOG, XMA_FILTER_MOD, "%s()\n", __func__);
     // Load the xmaplugin library as it is a dependency for all plugins
-    void *xmahandle = dlopen("libxmaplugin_legacy.so",
+    void *xmahandle = dlopen("libxmaplugin.so",
                              RTLD_LAZY | RTLD_GLOBAL);
     if (!xmahandle)
     {

diff --git a/src/xma/xma_legacy/src/xmaapi/xmakernel.cpp b/src/xma/xma_legacy/src/xmaapi/xmakernel.cpp
@@ -38,7 +38,7 @@ xma_kernel_plugins_load(XmaSystemCfg      *systemcfg,
 
     xma_logmsg(XMA_DEBUG_LOG, XMA_KERNEL_MOD, "%s()\n", __func__);
     // Load the xmaplugin library as it is a dependency for all plugins
-    void *xmahandle = dlopen("libxmaplugin_legacy.so",
+    void *xmahandle = dlopen("libxmaplugin.so",
                              RTLD_LAZY | RTLD_GLOBAL);
     if (!xmahandle)
     {

diff --git a/src/xma/xma_legacy/src/xmaapi/xmascaler.cpp b/src/xma/xma_legacy/src/xmaapi/xmascaler.cpp
@@ -120,7 +120,7 @@ xma_scaler_plugins_load(XmaSystemCfg      *systemcfg,
 
     xma_logmsg(XMA_DEBUG_LOG, XMA_SCALER_MOD, "%s()\n", __func__);
     // Load the xmaplugin library as it is a dependency for all plugins
-    void *xmahandle = dlopen("libxmaplugin_legacy.so",
+    void *xmahandle = dlopen("libxmaplugin.so",
                              RTLD_LAZY | RTLD_GLOBAL);
     if (!xmahandle)
     {

diff --git a/src/xma/xma_legacy/src/xmaplugin/CMakeLists.txt b/src/xma/xma_legacy/src/xmaplugin/CMakeLists.txt
@@ -8,10 +8,10 @@ set(XMA_PLUGIN_ALL_SRC
   ${XMA_PLUGIN_FILES}
   )
 
-add_library(xmaplugin_legacy SHARED ${XMA_PLUGIN_ALL_SRC})
+add_library(xmaplugin SHARED ${XMA_PLUGIN_ALL_SRC})
 #target_include_directories(xmaplugin "${XML2_LIB_INCLUDE}")
 
-set_target_properties(xmaplugin_legacy PROPERTIES VERSION ${XMA_VERSION_STRING}
+set_target_properties(xmaplugin PROPERTIES VERSION ${XMA_VERSION_STRING}
   SOVERSION ${XMA_SOVERSION})
 
 #target_link_libraries(xmaplugin "${XML2_LIB}")
@@ -20,7 +20,7 @@ set_target_properties(xmaplugin_legacy PROPERTIES VERSION ${XMA_VERSION_STRING}
 #  xrt_core
 #  )
 
-install (TARGETS xmaplugin_legacy LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib)
+install (TARGETS xmaplugin LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib)
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libxmaplugin.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/libxmaplugin.pc @ONLY)
 #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libxmaplugin.pc DESTINATION ${XMA_INSTALL_DIR}/lib/pkgconfig)