Changeset 4fdf15 in git


Ignore:
Timestamp:
Nov 17, 2011, 8:18:57 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
8ccf0107fc81b23d2dfb7e6ebb65e30242797efd
Parents:
dd5fa68c4187968f9d7b2351a53fe3c164c36398
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-17 20:18:57+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-19 03:27:48+01:00
Message:
CHG: combine lib{misc/reporter/resources/coeffs/polys} together and install as a single library
FIX: correction of LDADD for libpolys/tests
FIX: adaptation to single libpolys(_g).la in Singular
FIX: correct data in lib*-config.in
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    rdd5fa6 r4fdf15  
    177177# handle all the generated *.inc
    178178
    179 AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys -L${abs_top_builddir}/libpolys/coeffs -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/resources -L${abs_top_builddir}/libpolys/misc $(USE_FACTORY) -L${abs_top_builddir}/omalloc
     179AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc
    180180
    181181noinst_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
    … …  
    220220Singularg_SOURCES = tesths.cc
    221221
    222 Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    223 Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     222Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     223Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    224224
    225225Singular_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    … …  
    259259testg_SOURCES = test.cc
    260260
    261 testr_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    262 testg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     261testr_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     262testg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    263263
    264264testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG

  • libpolys/coeffs/Makefile.am

    rdd5fa6 r4fdf15  
    1 libcoeffs_LTLIBRARIES = libcoeffs.la libcoeffs_g.la
    2 libcoeffsdir = $(libdir)/singular
     1noinst_LTLIBRARIES = libcoeffs.la libcoeffs_g.la
     2# libcoeffsdir = $(libdir)/singular
    33
    44CXXTEMPLFLAGS =  --no-exceptions

  • libpolys/libpolys-config.in

    rdd5fa6 r4fdf15  
    6969
    7070    --libsg)
    71         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     71        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7272        ;;
    7373
    7474    --libs)
    75         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys -lcoeffs -lresources -lreporter -lmisc @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     75        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7676        ;;
    7777

  • libpolys/misc/Makefile.am

    rdd5fa6 r4fdf15  
    1 libmisc_LTLIBRARIES = libmisc.la libmisc_g.la
    2 libmiscdir = $(libdir)/singular
     1noinst_LTLIBRARIES = libmisc.la libmisc_g.la
     2# libmiscdir = $(libdir)/singular
    33
    44CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates

  • libpolys/polys/Makefile.am

    rdd5fa6 r4fdf15  
    135135
    136136
     137libpolys_la_LIBADD = ${abs_top_builddir}/misc/libmisc.la ${abs_top_builddir}/reporter/libreporter.la ${abs_top_builddir}/resources/libresources.la ${abs_top_builddir}/coeffs/libcoeffs.la
     138libpolys_g_la_LIBADD = ${abs_top_builddir}/misc/libmisc_g.la ${abs_top_builddir}/reporter/libreporter_g.la ${abs_top_builddir}/resources/libresources_g.la ${abs_top_builddir}/coeffs/libcoeffs_g.la
     139
     140
    137141#################################################
    138142# autogenerated sources

  • libpolys/reporter/Makefile.am

    rdd5fa6 r4fdf15  
    1 libreporter_LTLIBRARIES=libreporter.la libreporter_g.la
    2 libreporterdir = $(libdir)/singular
     1noinst_LTLIBRARIES=libreporter.la libreporter_g.la
     2# libreporterdir = $(libdir)/singular
    33
    44CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates

  • libpolys/resources/Makefile.am

    rdd5fa6 r4fdf15  
    1 libresources_LTLIBRARIES=libresources.la libresources_g.la
    2 libresourcesdir = $(libdir)/singular
     1noinst_LTLIBRARIES=libresources.la libresources_g.la
     2# libresourcesdir = $(libdir)/singular
    33
    44CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates

  • libpolys/tests/Makefile.am

    rdd5fa6 r4fdf15  
    3131
    3232coeffs_test_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
    33 polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD)
     33polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
    3434rings_test_LDADD = $(polys_test_LDADD)
    3535

  • libsingular-config.in

    rdd5fa6 r4fdf15  
    6969
    7070    --libsg)
    71         ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     71        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lkernel_g -lpolys_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7272        ;;
    7373
    7474    --libs)
    75         ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     75        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular -lkernel -lpolys @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7676        ;;
    7777
Note: See TracChangeset for help on using the changeset viewer.