summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsetup.py43
1 files changed, 25 insertions, 18 deletions
diff --git a/setup.py b/setup.py
index c8c25cc..5fd62b0 100755
--- a/setup.py
+++ b/setup.py
@@ -231,11 +231,7 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
231 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION) 231 ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', EFL_MIN_VERSION)
232 ecore_file_cflags, ecore_file_libs = pkg_config( 232 ecore_file_cflags, ecore_file_libs = pkg_config(
233 'EcoreFile', 'ecore-file', EFL_MIN_VERSION) 233 'EcoreFile', 'ecore-file', EFL_MIN_VERSION)
234 ecore_input_cflags, ecore_input_libs = pkg_config( 234 ecore_exts = [
235 'EcoreInput', 'ecore-input', EFL_MIN_VERSION)
236 ecore_x_cflags, ecore_x_libs = pkg_config(
237 'EcoreX', 'ecore-x', EFL_MIN_VERSION)
238 ecore_exts = (
239 Extension( 235 Extension(
240 "ecore.__init__", ["efl/ecore/__init__" + module_suffix], 236 "ecore.__init__", ["efl/ecore/__init__" + module_suffix],
241 include_dirs=['include/'], 237 include_dirs=['include/'],
@@ -243,19 +239,30 @@ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
243 extra_link_args=ecore_libs + ecore_file_libs + eina_libs + 239 extra_link_args=ecore_libs + ecore_file_libs + eina_libs +
244 evas_libs 240 evas_libs
245 ), 241 ),
246 Extension( 242 ]
247 "ecore.x", ["efl/ecore/x" + module_suffix], 243 try:
248 include_dirs=['include/'], 244 ecore_input_cflags, ecore_input_libs = pkg_config(
249 extra_compile_args= 245 'EcoreInput', 'ecore-input', EFL_MIN_VERSION)
250 list(set( 246 ecore_x_cflags, ecore_x_libs = pkg_config(
251 ecore_cflags + ecore_file_cflags + ecore_x_cflags + 247 'EcoreX', 'ecore-x', EFL_MIN_VERSION)
252 ecore_input_cflags 248 except SystemExit: # FIXME: Change pkg-config to return a value
253 )), 249 pass
254 extra_link_args= 250 else:
255 ecore_libs + ecore_file_libs + ecore_x_libs + ecore_input_libs + 251 ecore_exts.append(
256 eina_libs + evas_libs, 252 Extension(
257 ) 253 "ecore.x", ["efl/ecore/x" + module_suffix],
258 ) 254 include_dirs=['include/'],
255 extra_compile_args=
256 list(set(
257 ecore_cflags + ecore_file_cflags + ecore_x_cflags +
258 ecore_input_cflags
259 )),
260 extra_link_args=
261 ecore_libs + ecore_file_libs + ecore_x_libs +
262 ecore_input_libs +
263 eina_libs + evas_libs,
264 )
265 )
259 modules += ecore_exts 266 modules += ecore_exts
260 packages.append("efl.ecore") 267 packages.append("efl.ecore")
261 268