Refactor setup.py.in to simplify library naming and include uda_libs in the libraries list

Author: munechika-koyo

source/wrappers/python/setup.py.in

@@ -33,16 +33,16 @@ uda_lib_names = '@UDA_LIBS@'.split(';') if '@UDA_LIBS@' else []
 build_fat = os.environ.get('UDA_FAT_PYTHON', False)
 if build_fat:
     uda_libs = [
-        'libfat@PROJECT_NAME@_client.' + stalib_ext,
-        'lib@PROJECT_NAME@_plugins.' + stalib_ext,
-    ] + ['lib@PROJECT_NAME@_' + name + '.' + stalib_ext for name in uda_lib_names]
+        'fat@PROJECT_NAME@_client',
+        '@PROJECT_NAME@_plugins',
+    ] + ['@PROJECT_NAME@_' + name for name in uda_lib_names]
     extra_libs = ['xml2']
     extra_libs.extend('@EXTRA_LIBS@'.split(';') if '@EXTRA_LIBS@' else [])
     extra_macros = [('FATCLIENT', None)]
 else:
     uda_libs = [
-        'lib@PROJECT_NAME@_client.' + stalib_ext,
-    ] + ['lib@PROJECT_NAME@_' + name + '.' + stalib_ext for name in uda_lib_names]
+        '@PROJECT_NAME@_client',
+    ] + ['@PROJECT_NAME@_' + name for name in uda_lib_names]
     extra_libs = '@EXTRA_LIBS@'.split(';') if '@EXTRA_LIBS@' else []
     extra_macros = []
 
@@ -57,7 +57,7 @@ ext = Extension(
         numpy.get_include(),
         '@FMT_INCLUDE_DIR@'
     ])),
-    libraries=list(filter(None, ['ssl', 'crypto', 'xml2'] + extra_libs)),
+    libraries=list(filter(None, ['ssl', 'crypto', 'xml2'] + extra_libs + uda_libs)),
     library_dirs=list(filter(None, [
         '@STDCXX_LIB_DIR@',
         '@OPENSSL_LIB_DIR@',
@@ -72,7 +72,6 @@ ext = Extension(
         '@CAPNP_LIB_DIR@',
         '@FMT_LIB_DIR@'
     ])),
-    extra_objects=[os.path.join(root, 'lib', uda_lib) for uda_lib in uda_libs],
     extra_link_args=extra_link_args,
     extra_compile_args=extra_compile_args,
     language='c++',