Changeset f476eb in git

Timestamp:

May 7, 2014, 6:23:59 AM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

af87fd0ccfda4649a0cc8d2cc6315b48cd069e78

Parents:

ddf842c4ef6c46d23cbcbe888caa7c556ebba2b2

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 06:23:59+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-26 18:59:32+02:00

Message:

Moved pyobject to a separate directory under Singular/dyn_modules/

Files:

• Singular/Makefile.am (modified) (2 diffs)
• Singular/dyn_modules/Makefile.am (modified) (1 diff)
• Singular/dyn_modules/pyobject/Makefile.am (added)
• Singular/dyn_modules/pyobject/pyobject.cc (moved) (moved from Singular/pyobject.cc)
• configure.ac (modified) (1 diff)

Singular/Makefile.am

@@ -4 +4 @@
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES)  $(GMP_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
+
+########################### Dynamic Modules... #########################
+SUBDIRS = dyn_modules
 
 if HAVE_GFANLIB
@@ -11 +14 @@
 endif
 
-# AM_LDFLAGS = libSingular.la ${top_builddir}/kernel/libkernel.la
-
-########################### Dynamic Modules... #########################
-SUBDIRS = dyn_modules
-
-if ENABLE_P_PROCS_DYNAMIC
-  moduledir = $(libexecdir)/singular/MOD
-else !ENABLE_P_PROCS_DYNAMIC
-  moduledir = $(libdir)/singular
-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  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) 
+  PY=${builddir}/dyn_modules/pyobject/pyobject.la
 else !PYTHON_USE
   PY=

Singular/dyn_modules/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-SUBDIRS=bigintm syzextra callgfanlib callpolymake
+SUBDIRS=bigintm syzextra callgfanlib callpolymake pyobject
 
 

configure.ac

@@ -238 +238 @@
 AC_CONFIG_FILES([Singular/dyn_modules/callgfanlib/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/callpolymake/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/pyobject/Makefile])
 
 AC_CONFIG_FILES([Singular/Makefile])