Changeset b36460 in git

Timestamp:

Dec 5, 2012, 3:35:13 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a07784ce2c96d788165ee1c5046e4e2f60bec8e3

Parents:

3c4ee7ec0db9654a8c35db2316417a2de54aa6e6

Message:

Supporting  pyobject.so

Files:

• Singular/Makefile.am (modified) (2 diffs)
• Singular/tesths.cc (modified) (1 diff)
• configure.ac (modified) (1 diff)

Singular/Makefile.am

@@ -88 +88 @@
    links/ssiLink.cc\
    subexpr.cc\
+   pyobject_setup.cc\
    walk.cc\
    walk_ip.cc\
@@ -395 +396 @@
    PACKAGES=pyobject
    moduledir = $(bindir)
-   module_LTLIBRARIES=pyobject.so
-   pyobject_so_SOURCES = pyobject.cc
-   pyobject_so_LIBADD =  libSingular.la -lnumeric -lkernel -lpolys  -lcoeffs \
+   module_LTLIBRARIES=pyobject.la
+   pyobject_la_SOURCES = pyobject.cc
+   pyobject_la_LIBADD =  libSingular.la -lnumeric -lkernel -lpolys  -lcoeffs \
   -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) \
 $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
 
 
-   pyobject_so_CPPFLAGS  = ${AM_CPPFLAGS} @PYTHON_CSPEC@ ${Singular_LDADD} ${AMLDFLAGS}
-   pyobject_so_LDFLAGS = ${AMLDFLAGS}  -shared -module -avoid-version @PYTHON_LSPEC@ \
- -DHUHUHUHUHU ${pyobject_so_LIBADD}
-endif
+   pyobject_la_CPPFLAGS  = ${AM_CPPFLAGS} @PYTHON_CSPEC@ ${Singular_LDADD} ${AMLDFLAGS}
+   pyobject_la_LDFLAGS = ${AMLDFLAGS} -export-dynamic  -shared -module -avoid-version @PYTHON_LSPEC@ \
+ -DHUHUHUHUHU ${pyobject_la_LIBADD}
+endif

Singular/tesths.cc

@@ -43 +43 @@
 #include "fegetopt.h"
 
-// #include "pyobject_setup.h"
+#include "pyobject_setup.h"
 
 #include <unistd.h>

configure.ac

@@ -61 +61 @@
 AX_PYTHON_WITH()
 AX_PYTHON_VERSION_ENSURE( [2.4] )
+AX_PYTHON_DEVEL([>= 2.4])
 AX_PYTHON_LSPEC()
 AX_PYTHON_CSPEC()