Changeset f6e134 in git


Ignore:
Timestamp:
Feb 2, 2017, 3:21:44 PM (7 years ago)
Author:
Erik M. Bray <erik.bray@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
61fc1e3830fd4a8b592475b8c88639f3d860b87d
Parents:
3b7b3650a65b00ad55d99a0b87bca836c6c2879f
Message:
Make modules in dyn_modules require libSingular to be built first on
Windows only, and only for modules that are not being built as built-in
modules.
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r3b7b36 rf6e134  
    77all-local: feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib gftables MOD ${abs_builddir}/LIB Singular$(EXEEXT) ESingular$(EXEEXT) TSingular$(EXEEXT)
    88
    9 SUBDIRS = . dyn_modules
     9if SING_WIN
     10SUBDIRS = ${BUILTIN_MODULES} . dyn_modules
     11else
     12SUBDIRS = dyn_modules .
     13endif
    1014
    1115########################### Possible builtin modules... #########################

  • Singular/dyn_modules/Order/Makefile.am

    r3b7b36 rf6e134  
    2626Order_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    2727Order_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS} $(SINGULAR_LDFLAGS)
     28if SING_WIN
     29if !SI_BUILTIN_ORDER
    2830Order_la_LIBADD    = ${top_builddir}/Singular/libSingular.la
     31endif
     32endif
    2933
    3034# AM_COLOR_TESTS=always

  • Singular/dyn_modules/bigintm/Makefile.am

    r3b7b36 rf6e134  
    2222bigintm_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    2323bigintm_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
     24if SING_WIN
     25if !SI_BUILTIN_BIGINTM
    2426bigintm_la_LIBADD   = ${top_builddir}/Singular/libSingular.la
     27endif
     28endif
    2529
    2630# AM_COLOR_TESTS=always

  • Singular/dyn_modules/customstd/Makefile.am

    r3b7b36 rf6e134  
    2424customstd_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${CDDGMPCPPFLAGS}
    2525customstd_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
     26if SING_WIN
     27if !SI_BUILTIN_CUSTOMSTD
    2628customstd_la_LIBADD   = ${top_builddir}/Singular/libSingular.la
     29endif
     30endif
    2731
    2832#AM_COLOR_TESTS=always

  • Singular/dyn_modules/gfanlib/Makefile.am

    r3b7b36 rf6e134  
    3333CXXFLAGS+= $(FEXCEPTIONSFRTTI_CXXFLAGS)
    3434
    35 gfanlib_la_LIBADD = ${top_builddir}/Singular/libSingular.la
     35gfanlib_la_LIBADD   =
     36if SING_WIN
     37if !SI_BUILTIN_GFANLIB
     38 gfanlib_la_LIBADD   += ${top_builddir}/Singular/libSingular.la
     39endif
     40endif
     41
    3642if HAVE_GFANLIB
    3743 gfanlib_la_LIBADD   += ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}

  • Singular/dyn_modules/polymake/Makefile.am

    r3b7b36 rf6e134  
    2121endif
    2222
    23 polymake_la_LIBADD = ${top_builddir}/Singular/libSingular.la
     23polymake_la_LIBADD =
     24if SING_WIN
     25if !SI_BUILTIN_POLYMAKE
     26 polymake_la_LIBADD += ${top_builddir}/Singular/libSingular.la
     27endif
     28endif
     29
    2430if SING_HAVE_POLYMAKE
    2531# forcefully enable exceptions for polymake

  • Singular/dyn_modules/pyobject/Makefile.am

    r3b7b36 rf6e134  
    2525
    2626pyobject_la_LDFLAGS = $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
    27 pyobject_la_LIBADD = $(PYTHON_EXTRA_LIBS) $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) ${top_builddir}/Singular/libSingular.la
     27pyobject_la_LIBADD = $(PYTHON_EXTRA_LIBS) $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS)
     28if SING_WIN
     29if !SI_BUILTIN_PYOBJECT
     30  pyobject_la_LIBADD += ${top_builddir}/Singular/libSingular.la
     31endif
     32endif

  • Singular/dyn_modules/singmathic/Makefile.am

    r3b7b36 rf6e134  
    2222singmathic_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} ${MATHIC_LIBS} $(SINGULAR_LDFLAGS)
    2323
     24if SING_WIN
     25if !SI_BUILTIN_SINGMATHIC
     26 singmathic_la_LIBADD = ${top_srcdir}/Singular/libSingular.la
     27endif
     28endif
     29
    2430# AM_COLOR_TESTS=always
    2531#

  • Singular/dyn_modules/syzextra/Makefile.am

    r3b7b36 rf6e134  
    2222syzextra_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    2323syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS} $(SINGULAR_LDFLAGS)
     24if SING_WIN
     25if !SI_BUILTIN_SYZEXTRA
    2426syzextra_la_LIBADD    = ${top_builddir}/Singular/libSingular.la
     27endif
     28endif
    2529
    2630AM_COLOR_TESTS=always

  • m4/options.m4

    r3b7b36 rf6e134  
    329329      LL="${LL} $a"
    330330      BUILTIN_LIBS="${BUILTIN_LIBS} dyn_modules/$a/$a.la"
     331      BUILTIN_MODULES="${BUILTIN_MODULES} dyn_modules/$a"
    331332      AC_MSG_RESULT(yes)
    332333
    … …  
    367368 AC_DEFINE_UNQUOTED([SI_BUILTINMODULES_ADD(add)],[$L],[Add(list) for Builtin modules])
    368369 AC_SUBST(BUILTIN_LIBS)
     370 AC_SUBST(BUILTIN_MODULES)
    369371
    370372 AM_CONDITIONAL([SI_BUILTIN_STATICDEMO], [test x$bi_staticdemo = xtrue])

  • m4/win-flags.m4

    r3b7b36 rf6e134  
    77dnl Maybe necessary for mingw as well but haven't tested
    88  case $host_os in
    9     *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
     9    *cygwin* | *mingw*) os_win32=yes;;
     10    *) os_win32=no;;
    1011  esac
    1112
     13  AC_SUBST(SINGULAR_LDFLAGS)
     14
     15  if test x$os_win32 = xyes; then
     16    AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic])
    1217dnl libtool requires "-no-undefined" for win32 dll
    13   AC_SUBST(SINGULAR_LDFLAGS)
    14   case $host_os in
    15     *cygwin* | *mingw*)
    16       if test x"$enable_shared" = xyes; then
    17         SINGULAR_LDFLAGS="$SINGULAR_LDFLAGS -no-undefined"
    18       fi
    19     ;;
    20   esac
     18    SINGULAR_LDFLAGS="$SINGULAR_LDFLAGS -no-undefined"
     19  fi
     20
     21  AM_CONDITIONAL([SING_WIN], [test x$os_win32 = xyes])
    2122])
Note: See TracChangeset for help on using the changeset viewer.