Changeset 1cb879 in git for Singular/Makefile.in

Timestamp:

Jan 27, 2011, 10:50:28 PM (13 years ago)

Author:

Alexander Dreyer <dreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1879f22456661161123888e861ef334514b8bd20

Parents:

a563a0dc0a8a549c10112615472e0db61d6b9aca

Message:

Merge branch 'master' of git+ssh://dreyer@git.berlios.de/gitroot/singular

git-svn-id: file:///usr/local/Singular/svn/trunk@13805 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/Makefile.in (modified) (13 diffs)

Singular/Makefile.in

@@ -15 +15 @@
 EXEC_EXT                = @EXEC_EXT@
 HAVE_PLURAL             = @PLURAL@
+
+##
+## Python related stuff
+##
+HAVE_PYTHON             = @HAVE_PYTHON_VALUE@
+PYTHON_CPPFLAGS         = @PYTHON_CPPFLAGS@
+PYTHON_LDFLAGS          = @PYTHON_LDFLAGS@
+PYTHON_SITE_PKG         = @PYTHON_SITE_PKG@
+PYTHON_EXTRA_LIBS       = @PYTHON_EXTRA_LIBS@
+PYTHON_EXTRA_LDFLAGS    = @PYTHON_EXTRA_LDFLAGS@
+
+# Note: compiler(!) flags for linking to python
+PYTHON_LINKFLAGS        = ${PYTHON_LDFLAGS} ${PYTHON_EXTRA_LIBS} ${PYTHON_EXTRA_LDFLAGS}
+
 ##
 ## various paths
@@ -56 +70 @@
 CXXTEMPLFLAGS   = @CXXTEMPLFLAGS@ -I.. -I@prefix@
 ifneq ($(SINGUNAME),ix86-Win)
-CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@
+CPPFLAGS        = -I${srcdir} -I.. -I@prefix@ @CPPFLAGS@ ${PYTHON_CPPFLAGS}
 else
 ## Dirs after @CPPFLAGS@ are for PySingular
@@ -87 +101 @@
 
 LD_LIBC         = -lc
-STATIC_LDFLAGS  = @STATIC_LDFLAGS@
+STATIC_LDFLAGS  = ${PYTHON_LINKFLAGS} @STATIC_LDFLAGS@
 # under cygwin, do not explicitly link against -lm, for it is the cygwin
 # lib -- if you really want to do this, use -lm as the _last_ thing on the
@@ -114 +128 @@
 
 SO_SUFFIX = so
+MODULE_SUFFIX = so
+
 #LIBSINGULAR_FLAGS = -export-dynamic 
 LIBSINGULAR_LD = $(CXX)
@@ -120 +136 @@
 ifeq ($(SINGUNAME),ix86Mac-darwin)
 SO_SUFFIX        = dylib
+MODULE_SUFFIX    = bundle
 LIBSINGULAR_FLAGS = -single_module
 LIBSINGULAR_LD = $(LD)
@@ -127 +144 @@
 MACOSX_DEPLOYMENT_TARGET=10.4
 SO_SUFFIX        = dylib
+MODULE_SUFFIX    = bundle
 LIBSINGULAR_FLAGS = -single_module
 LIBSINGULAR_LD = $(LD)
@@ -133 +151 @@
 ifeq ($(SINGUNAME),ix86-Win)
 SO_SUFFIX = dll
+MODULE_SUFFIX    = dll
 LIBSINGULAR_FLAGS = -shared
 LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc  -lhtmlhelp
@@ -139 +158 @@
 ifeq ($(SINGUNAME),ix86-SunOS)
 SO_SUFFIX  = so
+MODULE_SUFFIX    = so
 LIBSINGULAR_FLAGS = -shared
 LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
@@ -159 +179 @@
 DL_KERNEL       = @DL_KERNEL@
 GLIBC_DYN_FIX= @GLIBC_DYN_FIX@
+endif
+
+
+ifeq (${HAVE_PYTHON},1)
+PYOBJECT_MODULE = pyobject.${MODULE_SUFFIX}
+else
+PYOBJECT_MODULE = 
 endif
 
@@ -191 +218 @@
     MinorProcessor.cc \
     MinorInterface.cc \
-    bigintm.cc
+    bigintm.cc pyobject_setup.cc 
 
 # stuff for MP
@@ -259 +286 @@
 OBJS    := $(OBJS) $(DL_KERNEL_SOURCES:.cc=.o)
 DBMSR_SO= dbmsr.so
-DL_LIBS := $(DBMSR_SO)
+DL_LIBS := $(DBMSR_SO) ${PYOBJECT_MODULE}
 ifeq ($(HAVE_MPSR), 1)
 MPSR_SO =       mpsr.so
-DL_LIBS :=      $(DL_LIBS) $(MPSR_SO)
+DL_LIBS :=      $(DL_LIBS) $(MPSR_SO) ${PYOBJECT_MODULE}
 endif
 else
@@ -332 +359 @@
         sleep 1
         echo "#define HAVE_STATIC" > static.h
+        rm -f pyobject_setup.o
         (cd ../kernel;rm -f mod_raw.o;${MAKE} LD_STATIC=1 depend install-bindist;cd ../Singular)
         ${MAKE} LD_STATIC=1 S_EXT="-static" depend Singular-static
@@ -454 +482 @@
         $(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
 
+# dynamic module for python bject support
+pyobject.${MODULE_SUFFIX}: pyobject.dl_o
+        @echo "build dynamic module pyobject..."
+        $(CXX) ${SLDFLAGS} ${PYTHON_LINKFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
+
 src: scanner.cc grammar.h grammar.cc libparse.cc