diff --git a/src/module_list.py b/src/module_list.py index d7b5f459cf0..a0111134391 100644 --- a/src/module_list.py +++ b/src/module_list.py @@ -403,13 +403,10 @@ def uname_specific(name, value, alternative): OptionalExtension("sage.graphs.mcqd", ["sage/graphs/mcqd.pyx"], - language = "c++", package = 'mcqd'), OptionalExtension("sage.graphs.bliss", ["sage/graphs/bliss.pyx"], - language = "c++", - libraries = ['bliss'], package = 'bliss'), Extension('sage.graphs.planarity', @@ -527,8 +524,6 @@ def uname_specific(name, value, alternative): OptionalExtension("sage.libs.fes", ["sage/libs/fes.pyx"], - language = "c", - libraries = ['fes'], package = 'fes'), Extension('sage.libs.flint.flint', @@ -560,9 +555,7 @@ def uname_specific(name, value, alternative): OptionalExtension('sage.libs.sirocco', sources = ["sage/libs/sirocco.pyx"], - libraries = ["sirocco"], - package="sirocco", - language = 'c++'), + package="sirocco"), Extension('*', ['sage/libs/linbox/*.pyx']), @@ -583,7 +576,6 @@ def uname_specific(name, value, alternative): OptionalExtension("sage.libs.meataxe", sources = ['sage/libs/meataxe.pyx'], - libraries = ['mtx'], package = 'meataxe'), Extension('*', ['sage/libs/pari/*.pyx']), @@ -894,7 +886,6 @@ def uname_specific(name, value, alternative): OptionalExtension("sage.matrix.matrix_gfpn_dense", sources = ['sage/matrix/matrix_gfpn_dense.pyx'], - libraries = ['mtx'], package = 'meataxe'), Extension('sage.matrix.misc', diff --git a/src/sage/graphs/bliss.pyx b/src/sage/graphs/bliss.pyx index 7bfa4018643..d21c034a6e3 100644 --- a/src/sage/graphs/bliss.pyx +++ b/src/sage/graphs/bliss.pyx @@ -1,3 +1,7 @@ +# distutils: language = c++ +# distutils: libraries = bliss +# sage_setup: package = sage-bliss + r""" Interface with bliss: graph (iso/auto)morphism diff --git a/src/sage/graphs/mcqd.pyx b/src/sage/graphs/mcqd.pyx index 0ed4ac68959..e768d36fc8e 100644 --- a/src/sage/graphs/mcqd.pyx +++ b/src/sage/graphs/mcqd.pyx @@ -1,3 +1,5 @@ +# distutils: language = c++ +# sage_setup: package = sage-mcqd from sage.ext.memory_allocator cimport MemoryAllocator diff --git a/src/sage/interfaces/primecount.pyx b/src/sage/interfaces/primecount.pyx index 6f0fea413f8..9f2ed88e0e8 100644 --- a/src/sage/interfaces/primecount.pyx +++ b/src/sage/interfaces/primecount.pyx @@ -1,3 +1,5 @@ +# sage_setup: package = sage-primecount + r""" Interface to the primecount library """ diff --git a/src/sage/libs/fes.pyx b/src/sage/libs/fes.pyx index 3cc2e35c8c0..06a8db7f62e 100644 --- a/src/sage/libs/fes.pyx +++ b/src/sage/libs/fes.pyx @@ -1,3 +1,6 @@ +# distutils: language = c +# distutils: libraries = fes +# sage_setup: distribution = sage-fes """ Binding for the FES library diff --git a/src/sage/libs/meataxe.pyx b/src/sage/libs/meataxe.pyx index 7549e55e0d9..f6fc4be1585 100644 --- a/src/sage/libs/meataxe.pyx +++ b/src/sage/libs/meataxe.pyx @@ -1,3 +1,5 @@ +# distutils: libraries = mtx +# sage_setup: distribution = sage-meataxe #***************************************************************************** # Copyright (C) 2017 Simon King # diff --git a/src/sage/libs/sirocco.pyx b/src/sage/libs/sirocco.pyx index f3b4fabbc90..fecf69bfb1b 100644 --- a/src/sage/libs/sirocco.pyx +++ b/src/sage/libs/sirocco.pyx @@ -1,4 +1,7 @@ #cython: boundscheck=False, wraparound=False +# distutils: libraries = sirocco +# distutils: language = c++ +# sage_setup: distribution = sage-sirocco r""" Cython wrapper for sirocco library diff --git a/src/sage/matrix/matrix_gfpn_dense.pyx b/src/sage/matrix/matrix_gfpn_dense.pyx index ed9c0aaf09f..42af34dc10b 100644 --- a/src/sage/matrix/matrix_gfpn_dense.pyx +++ b/src/sage/matrix/matrix_gfpn_dense.pyx @@ -1,3 +1,5 @@ +# distutils: libraries = mtx +# sage_setup: distribution = sage-meataxe r""" Dense Matrices over `\mathbb F_q`, with `q<255`.