Changeset 3b7b36 in git


Ignore:
Timestamp:
Nov 30, 2016, 4:31:11 PM (7 years ago)
Author:
Erik M. Bray <erik.bray@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
f6e134d4455dbb70a1514f4e5f64dac2e165f062
Parents:
92a783db4ae2d2bda1979855012b407ac340e9a4
Message:
Updated configure.ac and Makefile.am files to work on Windows, taking
advantage of the new SING_WIN_FLAGS macro.

* In configure.ac use SING_WIN_FLAGS, and also use LT_INIT([win32-dll])
  to tell libtool to build DLLs.
* In Makefile.am add $(SINGULAR_LDFLAGS) to _la_LDFLAGS variables--on
  most platforms $(SINGULAR_LDFLAGS) will be empty, currently, but this
  is used on Windows to pass the required -no-undefined flag to
  libtool.
* In some Makefile.am files add/update _la_LIBADD variables to ensure
  that libSingular.la is found by modules that need symbols from
  libSingular.
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r92a783 r3b7b36  
    124124nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc
    125125
    126 libSingular_la_LDFLAGS    =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
     126libSingular_la_LDFLAGS    =$(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
    127127libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
    128128

  • Singular/dyn_modules/Order/Makefile.am

    r92a783 r3b7b36  
    2525Order_la_SOURCES   = $(SOURCES)
    2626Order_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    27 Order_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS}
     27Order_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS} $(SINGULAR_LDFLAGS)
     28Order_la_LIBADD    = ${top_builddir}/Singular/libSingular.la
    2829
    2930# AM_COLOR_TESTS=always

  • Singular/dyn_modules/bigintm/Makefile.am

    r92a783 r3b7b36  
    2121bigintm_la_SOURCES  = mod_main.cc bigintm.cc bigintm.h
    2222bigintm_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    23 bigintm_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
     23bigintm_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
     24bigintm_la_LIBADD   = ${top_builddir}/Singular/libSingular.la
    2425
    2526# AM_COLOR_TESTS=always

  • Singular/dyn_modules/customstd/Makefile.am

    r92a783 r3b7b36  
    2323
    2424customstd_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${CDDGMPCPPFLAGS}
    25 customstd_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
     25customstd_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
     26customstd_la_LIBADD   = ${top_builddir}/Singular/libSingular.la
    2627
    2728#AM_COLOR_TESTS=always

  • Singular/dyn_modules/gfanlib/Makefile.am

    r92a783 r3b7b36  
    2828
    2929gfanlib_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${CDDGMPCPPFLAGS}
    30 gfanlib_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
     30gfanlib_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
    3131
    3232# forcefully enable exceptions for polymake
    3333CXXFLAGS+= $(FEXCEPTIONSFRTTI_CXXFLAGS)
    3434
     35gfanlib_la_LIBADD = ${top_builddir}/Singular/libSingular.la
    3536if HAVE_GFANLIB
    36  gfanlib_la_LIBADD   = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
     37 gfanlib_la_LIBADD   += ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
    3738endif
    3839

  • Singular/dyn_modules/polymake/Makefile.am

    r92a783 r3b7b36  
    2121endif
    2222
     23polymake_la_LIBADD = ${top_builddir}/Singular/libSingular.la
    2324if SING_HAVE_POLYMAKE
    2425# forcefully enable exceptions for polymake
    … …  
    2627 PM_CXXFLAGS= ${FEXCEPTIONSFRTTI_CXXFLAGS}
    2728 P_PROCS_MODULE_LDFLAGS+= ${PM_LDFLAGS}
    28  polymake_la_LIBADD= ${PM_LIBS}
     29 polymake_la_LIBADD+= ${PM_LIBS}
    2930endif
    3031
    … …  
    3940polymake_la_CFLAGS   = ${PM_CXXFLAGS}
    4041
    41 polymake_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
     42polymake_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)

  • Singular/dyn_modules/pyobject/Makefile.am

    r92a783 r3b7b36  
    2424pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS)  ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}
    2525
    26 pyobject_la_LDFLAGS = $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) ${P_PROCS_MODULE_LDFLAGS}
    27 pyobject_la_LIBADD = $(PYTHON_EXTRA_LIBS) $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS)
     26pyobject_la_LDFLAGS = $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
     27pyobject_la_LIBADD = $(PYTHON_EXTRA_LIBS) $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) ${top_builddir}/Singular/libSingular.la

  • Singular/dyn_modules/singmathic/Makefile.am

    r92a783 r3b7b36  
    2020singmathic_la_SOURCES  = singmathic.cc
    2121singmathic_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    22 singmathic_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} ${MATHIC_LIBS}
     22singmathic_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS} ${MATHIC_LIBS} $(SINGULAR_LDFLAGS)
    2323
    2424# AM_COLOR_TESTS=always

  • Singular/dyn_modules/staticdemo/Makefile.am

    r92a783 r3b7b36  
    1313  staticdemo_la_SOURCES   = staticdemo.cc
    1414  staticdemo_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    15   staticdemo_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
     15  staticdemo_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} $(SINGULAR_LDFLAGS)
    1616else
    1717  EXTRA_DIST=staticdemo.cc

  • Singular/dyn_modules/syzextra/Makefile.am

    r92a783 r3b7b36  
    2121syzextra_la_SOURCES   = $(SOURCES)
    2222syzextra_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    23 syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS}
     23syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS} $(SINGULAR_LDFLAGS)
     24syzextra_la_LIBADD    = ${top_builddir}/Singular/libSingular.la
    2425
    2526AM_COLOR_TESTS=always

  • configure.ac

    r92a783 r3b7b36  
    5050AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
    5151
    52 LT_INIT
     52LT_INIT([win32-dll])
    5353
    5454link_all_deplibs=yes
    … …  
    107107SING_CHECK_CPU
    108108
    109 #check for host:
    110 AC_CANONICAL_HOST
    111 
    112 case $host_os in
    113   *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
    114 esac
     109SING_WIN_FLAGS
    115110
    116111PKG_REQUIRE="$PKG_REQUIRE"

  • factory/Makefile.am

    r92a783 r3b7b36  
    1212$(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS)
    1313
    14 libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
     14libfactory_la_LDFLAGS    = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
    1515
    1616# factory source files

  • factory/configure.ac

    r92a783 r3b7b36  
    4545## AC_DISABLE_STATIC
    4646AC_PROG_YACC
    47 LT_INIT
     47LT_INIT([win32-dll])
    4848AC_PROG_MAKE_SET
    4949AC_CHECK_PROG(AR, ar, ar, where-is-your-ar)
    … …  
    5353AC_C_CONST
    5454AC_C_INLINE
     55
     56
     57SING_WIN_FLAGS
    5558
    5659

  • gfanlib/Makefile.am

    r92a783 r3b7b36  
    1717SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
    1818libgfan_la_SOURCES = $(SOURCES)
     19libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS)
    1920
    2021libgfan_includedir =$(includedir)/gfanlib

  • gfanlib/configure.ac

    r92a783 r3b7b36  
    2828
    2929# Checks for libraries.
    30 LT_INIT
     30LT_INIT([win32-dll])
     31
     32SING_WIN_FLAGS
    3133
    3234# Checks for header files.

  • kernel/Makefile.am

    r92a783 r3b7b36  
    1616libkernelCommon_la_LIBADD   = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
    1717${abs_top_builddir}/libpolys/polys/libpolys.la
     18libkernelCommon_la_LDFLAGS = $(SINGULAR_LDFLAGS)
    1819
    1920###### libkerneldir = $(libdir)/singular
    … …  
    2324
    2425libkernel_la_SOURCES=$(KERNELHEADERS)
     26libkernel_la_LDFLAGS = $(SINGULAR_LDFLAGS)
    2527
    2628libkernel_la_includedir=${includedir}/singular/kernel

  • libpolys/coeffs/Makefile.am

    r92a783 r3b7b36  
    3333$(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    3434
     35libcoeffs_la_LDFLAGS = $(SINGULAR_LDFLAGS)
     36
    3537TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    3638TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)'

  • libpolys/configure.ac

    r92a783 r3b7b36  
    3030# Turn off shared libraries during beta-testing, since they
    3131# make the build process take too long.
    32 LT_INIT
     32LT_INIT([win32-dll])
    3333# ([shared])
    34 # LT_INIT(dlopen disable-static) # doesn't work on PowerPC!
     34# LT_INIT([win32-dll])(dlopen disable-static) # doesn't work on PowerPC!
     35
     36SING_WIN_FLAGS
    3537
    3638# Checks for libraries.

  • libpolys/misc/Makefile.am

    r92a783 r3b7b36  
    1010
    1111libmisc_la_SOURCES   = int64vec.cc options.c sirandom.c intvec.cc prime.cc
     12libmisc_la_LDFLAGS = $(SINGULAR_LDFLAGS)
    1213
    1314libmisc_la_includedir = $(includedir)/singular/misc

  • libpolys/polys/Makefile.am

    r92a783 r3b7b36  
    6666p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
    6767
    68 P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -Wl,-undefined -Wl,dynamic_lookup -flat_namespace
     68P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -Wl,-undefined -Wl,dynamic_lookup -flat_namespace $(SINGULAR_LDFLAGS)
    6969
    7070p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
    … …  
    9595EXTRA_libpolys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
    9696
    97 libpolys_la_LDFLAGS= ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
     97libpolys_la_LDFLAGS= $(SINGULAR_LDFLAGS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION}
    9898libpolys_la_LIBADD = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${top_builddir}/coeffs/libcoeffs.la
    9999

  • libpolys/reporter/Makefile.am

    r92a783 r3b7b36  
    77
    88libreporter_la_SOURCES  = dError.cc reporter.cc s_buff.cc
     9libreporter_la_LDFLAGS = $(SINGULAR_LDFLAGS)
    910## libreporter_la_LDFLAGS  = -release ${PACKAGE_VERSION}
    1011## libreporter_la_LIBADD   = ${top_builddir}/misc/libmisc.la

  • omalloc/Makefile.am

    r92a783 r3b7b36  
    3131libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    3232
    33 libomalloc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
     33libomalloc_la_LDFLAGS    = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
    3434
    3535nodist_libomalloc_la_SOURCES = omTables.inc omTables.h mylimits.h

  • omalloc/configure.ac

    r92a783 r3b7b36  
    1717
    1818SING_RESET_FLAGS()
     19
     20SING_WIN_FLAGS
    1921
    2022AM_MAINTAINER_MODE([enable])
    … …  
    114116AC_C_INLINE
    115117
    116 LT_INIT
     118LT_INIT([win32-dll])
    117119
    118120

  • resources/Makefile.am

    r92a783 r3b7b36  
    1212libsingular_resources_la_SOURCES   = $(SOURCES)
    1313
    14 libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
     14libsingular_resources_la_LDFLAGS   = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
    1515
    1616libsingular_resources_includedir  =$(includedir)/resources

  • resources/configure.ac

    r92a783 r3b7b36  
    3939# Turn off shared libraries during beta-testing, since they
    4040# make the build process take too long.
    41 LT_INIT
     41LT_INIT([win32-dll])
    4242# ([shared])
    43 # LT_INIT(dlopen disable-static) # doesn't work on PowerPC!
     43# LT_INIT([win32-dll])(dlopen disable-static) # doesn't work on PowerPC!
    4444
    4545# SING_CHECK_PIPE
     46
     47SING_WIN_FLAGS
    4648
    4749##### SEE http://www.gnu.org/prep/standards/html_node/Directory-Variables.html

  • xalloc/Makefile.am

    r92a783 r3b7b36  
    1313libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    1414
    15 libomalloc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
     15libomalloc_la_LDFLAGS    = $(SINGULAR_LDFLAGS) -release ${PACKAGE_VERSION}
    1616
    1717libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS}

  • xalloc/configure.ac

    r92a783 r3b7b36  
    4444AC_C_INLINE
    4545
    46 LT_INIT
     46LT_INIT([win32-dll])
     47
     48SING_WIN_FLAGS
    4749
    4850
Note: See TracChangeset for help on using the changeset viewer.