Changeset 1684c3 in git for Singular/Makefile.am

Timestamp:

Nov 15, 2013, 5:09:41 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bbeddf73180e5a0b82609d4054f2cf3d3de40a27

Parents:

c6f0451f6fc744c2dac1401c4d9346c784f6b28b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:09:41+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:17:40+01:00

Message:

Fix BS to use python-config

fix: more default python base-names
add: extra python compiler flags

File:

• Singular/Makefile.am (modified) (9 diffs)

Singular/Makefile.am

@@ -19 +19 @@
 GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
 
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
+
 if ENABLE_FACTORY
   USE_FACTORY = -L${top_builddir}/factory
@@ -25 +27 @@
 endif
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
+if HAVE_GFANLIB
+  USE_GFANLIB = ${top_builddir}/dyn_modules/callgfanlib/gfanlib.la ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
+else
+  USE_GFANLIB = 
+endif
+
 AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
 
@@ -35 +42 @@
 endif !ENABLE_P_PROCS_DYNAMIC
 
+##########################################################################
+module_LTLIBRARIES = pyobject.la
+
+pyobject_la_SOURCES = pyobject.cc
+
+pyobject_la_CXXFLAGS = $(PYTHON_CSPEC)
+pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS)  ${AM_CPPFLAGS}
+
+pyobject_la_LDFLAGS = $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
+
+##########################################################################
 if PYTHON_USE
-  PY=pyobject.la
+  PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) 
 else !PYTHON_USE
   PY=
@@ -42 +61 @@
 
 if SI_EMBED_PYTHON
-  EMBED_PYOBJECT = ${PY} ${top_builddir}/dyn_modules/syzextra/syzextra.la 
+ EMBED_PYOBJECT   = ${PY} ${top_builddir}/dyn_modules/syzextra/syzextra.la ${USE_GFANLIB}
 else !SI_EMBED_PYTHON
   EMBED_PYOBJECT = 
 endif !SI_EMBED_PYTHON
-
-##########################################################################
-module_LTLIBRARIES = pyobject.la
-
-pyobject_la_SOURCES = pyobject.cc
-
-pyobject_la_CXXFLAGS = $(PYTHON_CSPEC)
-pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS)  ${AM_CPPFLAGS}
-
-pyobject_la_LIBS    = $(PYTHON_EXTRA_LIBS)
-pyobject_la_LDFLAGS = ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) $(PYTHON_LSPEC) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
-
-
-########################### libSingular* #########################
 
 # if WANT_DEBUG
@@ -206 +210 @@
 
 # plural_cmd.inc
-nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc ${EMBED_PYOBJECT}
-# nodist_libSingular_g_la_SOURCES = iparith.inc
+nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc 
 
 # -release ${PACKAGE_VERSION} 
@@ -279 +282 @@
 # Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
-Singular_LDADD = libSingular.la
-
+Singular_LDADD = libSingular.la ${EMBED_PYOBJECT}
+
+Singular_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT}
 # Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
 
@@ -288 +292 @@
 # Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-Singular_LDFLAGS = -static ${AM_LDFLAGS}
 # Singularg_LDFLAGS = -static ${AM_LDFLAGS}
 
@@ -305 +308 @@
 
 #  ${EMBED_PYOBJECT_LDFLAGS}  ${EMBED_PYOBJECT_LDFLAGS}
-Singulard_LDADD = libSingular.la
-
+Singulard_LDADD = libSingular.la ${EMBED_PYOBJECT}
 # Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
 
@@ -315 +317 @@
 # Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 
-Singulard_LDFLAGS = ${AM_LDFLAGS}
-# Singulardg_LDFLAGS = ${AM_LDFLAGS}
+Singulard_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT}