Hi,
I'm proposing the following patch to remove duplication in the
src/module_list.py file ; it's so simple I don't think it's worth
opening a ticket...
Snark on #sagemath
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/module_list.py b/src/module_list.py
index ac934d2..ed3d948 100755
--- a/src/module_list.py
+++ b/src/module_list.py
@@ -45,6 +45,8 @@ flint_depends = [SAGE_INC + '/flint/flint.h']
singular_depends = [SAGE_INC + '/libsingular.h']
givaro_depends = [SAGE_INC + '/givaro/givconfig.h']
+singular_incs = [SAGE_INC + '/singular', SAGE_INC + '/factory']
+
#########################################################
### M4RI flags
#########################################################
@@ -107,21 +109,21 @@ ext_modules = [
sources = ['sage/algebras/letterplace/free_algebra_letterplace.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.algebras.letterplace.free_algebra_element_letterplace',
sources = ['sage/algebras/letterplace/free_algebra_element_letterplace.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.algebras.letterplace.letterplace_ideal',
sources = ['sage/algebras/letterplace/letterplace_ideal.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.algebras.quatalg.quaternion_algebra_cython',
@@ -766,7 +768,7 @@ ext_modules = [
sources = ['sage/libs/singular/singular.pyx'],
libraries = ['givaro'] + singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends + givaro_depends,
extra_compile_args = givaro_extra_compile_args),
@@ -774,28 +776,28 @@ ext_modules = [
sources = ['sage/libs/singular/polynomial.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.libs.singular.ring',
sources = ['sage/libs/singular/ring.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.libs.singular.groebner_strategy',
sources = ['sage/libs/singular/groebner_strategy.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.libs.singular.function',
sources = ['sage/libs/singular/function.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends,
extra_compile_args = givaro_extra_compile_args),
@@ -803,7 +805,7 @@ ext_modules = [
sources = ['sage/libs/singular/option.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.libs.symmetrica.symmetrica',
@@ -1100,7 +1102,7 @@ ext_modules = [
sources = ['sage/matrix/matrix_mpolynomial_dense.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.matrix.matrix_rational_dense',
@@ -1791,14 +1793,14 @@ ext_modules = [
sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.rings.polynomial.plural',
sources = ['sage/rings/polynomial/plural.pyx'],
libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'],
language="c++",
- include_dirs = [SAGE_INC +'/singular'],
+ include_dirs = singular_incs,
depends = [SAGE_INC + "/libsingular.h"],
extra_compile_args = givaro_extra_compile_args),
@@ -1806,7 +1808,7 @@ ext_modules = [
sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'],
libraries = singular_libs,
language="c++",
- include_dirs = [SAGE_INC + '/singular', SAGE_INC + '/factory'],
+ include_dirs = singular_incs,
depends = singular_depends),
Extension('sage.rings.polynomial.multi_polynomial_ring_generic',
