Changeset 9a6ff99 in git


Ignore:
Timestamp:
Jan 8, 2014, 7:35:55 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
933be85ceaea1bf014a474707bd09e82af0a8bde
Parents:
997a5b282af0b323c9bb89271696d95981d58835
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 19:35:55+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 19:39:54+01:00
Message:
Merge sublibraries into bigger ones (packages)

libpolys: libmisc, libreporter, libcoeffs
libSingular: libkernel, libnumeric +?
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r997a5b2 r9a6ff99  
    3333##########################################################################
    3434if PYTHON_USE
    35   PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS)
     35  PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS)
    3636else !PYTHON_USE
    3737  PY=
    … …  
    230230# ESingular_LDFLAGS = -static ${AM_LDFLAGS}
    231231ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
    232 ${top_builddir}/libpolys/misc/libmisc.la
     232${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
     233${top_builddir}/resources/libresources.la
    233234
    234235
    … …  
    238239TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
    239240# TSingular_LDFLAGS = -static ${AM_LDFLAGS}
    240 TSingular_LDADD =   ${top_builddir}/libpolys/reporter/libreporter.la \
    241 ${top_builddir}/libpolys/misc/libmisc.la
     241TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
     242${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
     243${top_builddir}/resources/libresources.la
    242244
    243245TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc

  • kernel/Makefile.am

    r997a5b2 r9a6ff99  
    22# TODO: use ${top_srcdir} instead of .. in the above?
    33
    4 libkernel_LTLIBRARIES = libkernel.la
    5 libkerneldir = $(libdir)/singular
     4noinst_LTLIBRARIES = libkernel.la
     5###### libkerneldir = $(libdir)/singular
    66
    77AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) 
    … …  
    4949        f5c.h f5data.h f5gb.h f5lists.h
    5050
    51 libkernel_includedir  =${includedir}/singular/kernel
    52 libkernel_include_HEADERS   = $(KERNELHEADERS)
     51libkernel_la_includedir  =${includedir}/singular/kernel
     52libkernel_la_include_HEADERS   = $(KERNELHEADERS)
    5353
    5454if ENABLE_FACTORY
    … …  
    5959
    6060libkernel_la_LIBADD   =  ${top_builddir}/libpolys/polys/libpolys.la $(USE_FACTORY)
     61### libkernel_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    6162
    6263### TODO: the following has to be addapted...

  • libpolys/coeffs/Makefile.am

    r997a5b2 r9a6ff99  
    33AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS} 
    44
    5 libcoeffs_LTLIBRARIES = libcoeffs.la
    6 libcoeffsdir = $(libdir)/singular
     5# noinst???
     6noinst_LTLIBRARIES = libcoeffs.la
     7###### libcoeffsdir = $(libdir)/singular
    78
    89# noinst_HEADERS= \
    … …  
    2021libcoeffs_la_SOURCES   = $(SOURCES)
    2122
    22 libcoeffs_includedir  =$(includedir)/singular/coeffs
    23 libcoeffs_include_HEADERS = coeffs.h numbers.h si_gmp.h gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h rintegers.h rmodulo2m.h rmodulon.h shortfl.h mpr_complex.h mpr_global.h \
     23libcoeffs_la_includedir  =$(includedir)/singular/coeffs
     24libcoeffs_la_include_HEADERS = coeffs.h numbers.h si_gmp.h gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h rintegers.h rmodulo2m.h rmodulon.h shortfl.h mpr_complex.h mpr_global.h \
    2425  bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h
    2526
    … …  
    3334${USE_FACTORY} ${NTL_LIBS} ${GMP_LIBS}
    3435
     36## libcoeffs_la_LDFLAGS    = -release ${PACKAGE_VERSION}
     37
    3538TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    3639TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)'

  • libpolys/misc/Makefile.am

    r997a5b2 r9a6ff99  
    33AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. 
    44
    5 libmisc_LTLIBRARIES = libmisc.la
    6 libmiscdir = $(libdir)/singular
     5noinst_LTLIBRARIES = libmisc.la  libintvec.la
     6##### libmiscdir = $(libdir)/singular
    77
    8 noinst_LTLIBRARIES = libintvec.la
     8libmisc_la_LIBADD = libintvec.la
     9## ${top_builddir}/../omalloc/libomalloc.la ${top_builddir}/../resources/libresources.la
    910
    10 libmisc_la_LIBADD = libintvec.la \
    11 ${top_builddir}/../omalloc/libomalloc.la ${top_builddir}/../resources/libresources.la
    12 
    13 # libmisc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
     11## libmisc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1412
    1513libmisc_la_SOURCES   = int64vec.cc options.c
    1614
    17 libmisc_includedir = $(includedir)/singular/misc
    18 libmisc_include_HEADERS = mylimits.h options.h intvec.h int64vec.h
    19 nodist_libmisc_include_HEADERS = auxiliary.h
     15libmisc_la_includedir = $(includedir)/singular/misc
     16libmisc_la_include_HEADERS = mylimits.h options.h intvec.h int64vec.h
    2017
     18nodist_libmisc_la_include_HEADERS = auxiliary.h
    2119nodist_libmisc_la_SOURCES   = auxiliary.h
    2220

  • libpolys/reporter/Makefile.am

    r997a5b2 r9a6ff99  
    33AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. 
    44
    5 libreporter_LTLIBRARIES = libreporter.la
     5noinst_LTLIBRARIES = libreporter.la
     6#### libreporterdir = $(libdir)/singular
    67
    7 libreporterdir = $(libdir)/singular
     8libreporter_la_SOURCES  = dError.cc reporter.cc
     9## libreporter_la_LDFLAGS  = -release ${PACKAGE_VERSION}
     10## libreporter_la_LIBADD   = ${top_builddir}/misc/libmisc.la
    811
    9 libreporter_la_SOURCES   = dError.cc reporter.cc
     12libreporter_la_includedir  =$(includedir)/singular/reporter
     13libreporter_la_include_HEADERS   = reporter.h
    1014
    11 ## libreporter_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1215
    13 libreporter_includedir  =$(includedir)/singular/reporter
    14 
    15 libreporter_include_HEADERS   = reporter.h
    16 
    17 libreporter_la_LIBADD = ${top_builddir}/misc/libmisc.la
    18 

  • numeric/Makefile.am

    r997a5b2 r9a6ff99  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 libnumeric_LTLIBRARIES = libnumeric.la
     3noinst_LTLIBRARIES = libnumeric.la
     4### libnumericdir = $(libdir)/singular
    45
    5 libnumericdir = $(libdir)/singular
     6AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS}
    67
    7 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS} 
     8libnumeric_la_SOURCES   = mpr_base.cc mpr_inout.cc mpr_numeric.cc
    89
    9 SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc
    10 libnumeric_la_SOURCES   = $(SOURCES)
    11 
    12 libnumeric_la_LIBADD = ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la
     10### libnumeric_la_LIBADD = ${top_builddir}/kernel/libkernel.la
     11### ${top_builddir}/libpolys/polys/libpolys.la
    1312
    1413### libnumeric_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1514
    16 libnumeric_includedir  =$(includedir)/singular/numeric
    17 
    18 libnumeric_include_HEADERS = mpr_base.h mpr_inout.h mpr_numeric.h
     15libnumeric_la_includedir  =$(includedir)/singular/numeric
     16libnumeric_la_include_HEADERS = mpr_base.h mpr_inout.h mpr_numeric.h
    1917
    2018
Note: See TracChangeset for help on using the changeset viewer.