Changeset c70920 in git


Ignore:
Timestamp:
Jan 7, 2014, 6:35:13 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
f1b9ef6df309b52fb845716a27f07a3e7e39f2bb
Parents:
b3d84d43d109ae0e6239276d5c0df8c449da58d0
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-07 18:35:13+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 10:22:23+01:00
Message:
Better BS: use libtool dependency libs and LIBADD automake feature + cleanup

NOTE: libpolys should not check for flint (only factory works with it)
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    rb3d84d rc70920  
    44
    55AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
    6 
    7 if ENABLE_FACTORY
    8   USE_FACTORY = -L${top_builddir}/factory
    9 else
    10   USE_FACTORY =
    11 endif
    126
    137if HAVE_GFANLIB
    … …  
    1711endif
    1812
    19 AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
     13# AM_LDFLAGS = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la
    2014
    2115########################### Dynamic Modules... #########################
    … …  
    3933##########################################################################
    4034if PYTHON_USE
    41   PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS)
     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)
    4236else !PYTHON_USE
    4337  PY=
    … …  
    179173nodist_libSingular_la_SOURCES = feOpt.inc iparith.inc
    180174
    181 libSingular_la_LDFLAGS    = ${AM_LDFLAGS} ${EMBED_PYOBJECT} \
    182 -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \
    183 $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    184 
    185 libSingular_la_LIBADD      = ${EMBED_PYOBJECT} \
    186 -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc \
    187 $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    188 
    189 # ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la
    190 
     175libSingular_la_LDFLAGS    = ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     176
     177libSingular_la_LIBADD      = ${EMBED_PYOBJECT} ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la \
     178${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    191179
    192180
    … …  
    213201########################### Singular* #########################
    214202
    215 EXTRA_PROGRAMS =  libparse Singulard
     203EXTRA_PROGRAMS =  libparse Singulars
    216204
    217205# the "optional_programs" variable should be defined in the configure
    … …  
    223211Singular ESingular TSingular $(optional_Singular_programs): ${abs_builddir}/LIB
    224212
    225 nodist_Singular_SOURCES = libSingular.la
    226 
    227213Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
    228214
    229215Singular_LDADD = libSingular.la ${EMBED_PYOBJECT}
    230216
    231 Singular_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT}
    232 
    233 Singulard_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
    234 nodist_Singulard_SOURCES = libSingular.la
     217# Singular_LDFLAGS = ${EMBED_PYOBJECT}
     218
     219Singulars_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
    235220
    236221#  ${EMBED_PYOBJECT_LDFLAGS}  ${EMBED_PYOBJECT_LDFLAGS}
    237 Singulard_LDADD = libSingular.la ${EMBED_PYOBJECT}
    238 
    239 Singulard_LDFLAGS = ${AM_LDFLAGS} ${EMBED_PYOBJECT}
     222Singulars_LDADD = libSingular.la ${EMBED_PYOBJECT}
     223
     224# Singulars_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT}
    240225
    241226dist_bin_SCRIPTS = singularsurf
    … …  
    244229ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
    245230# ESingular_LDFLAGS = -static ${AM_LDFLAGS}
    246 ESingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
     231ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
     232${top_builddir}/libpolys/misc/libmisc.la
     233
    247234
    248235ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
    … …  
    251238TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
    252239# TSingular_LDFLAGS = -static ${AM_LDFLAGS}
    253 TSingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
     240TSingular_LDADD =   ${top_builddir}/libpolys/reporter/libreporter.la \
     241${top_builddir}/libpolys/misc/libmisc.la
    254242
    255243TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
    … …  
    262250libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
    263251
    264 # # libSingular.la -lnumeric
    265 libparse_LDADD = -lomalloc
     252libparse_LDADD = ${top_builddir}/omalloc/libomalloc.la
    266253# libparse_LDFLAGS = -static ${AM_LDFLAGS}
    267254# TODO for libparse: DONE by Hans???

  • dyn_modules/bigintm/Makefile.am

    rb3d84d rc70920  
    77  check_LTLIBRARIES=bigintm.la
    88 
    9 # if WANT_DEBUG
    10 # #  noinst_module_LTLIBRARIES+=bigintm_g.la
    11 #   check_LTLIBRARIES+=bigintm_g.la
    12 # endif
    13  
    149endif
    15 
    16 if ENABLE_FACTORY
    17   USE_FACTORY = -L${top_builddir}/factory
    18 else
    19   USE_FACTORY =
    20 endif
    21 
    22 # CXXTEMPLFLAGS = ${PIPE}
    23 #
    24 # DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
    25 #
    26 # NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer ${PIPE}
    27 # NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer ${CXXTEMPLFLAGS} -fno-exceptions -fno-rtti
    28 # ## -fno-implicit-templates?
    29 # NODEBUGDEFS = -DSING_NDEBUG -DOM_NDEBUG
    30 
    31 # -DHAVE_CONFIG_H??
    3210
    3311MYINCLUDES =  -I${top_srcdir} -I${top_builddir} -I${srcdir} \
    … …  
    3614$(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
    3715
    38 
    39 #### AM_LDFLAGS = -release ${PACKAGE_VERSION}
    40 # -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    41 # -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    42 
    43 
    44 SOURCES = mod_main.cc bigintm.cc bigintm.h
    45 bigintm_la_SOURCES   = $(SOURCES)
    46 # bigintm_g_la_SOURCES = $(SOURCES)
     16bigintm_la_SOURCES   = mod_main.cc bigintm.cc bigintm.h
    4717
    4818if ENABLE_P_PROCS_DYNAMIC
    … …  
    5323
    5424bigintm_la_CPPFLAGS   = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    55 #  ${NODEBUGDEFS}
    56 # bigintm_g_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    57 
    58 # bigintm_la_CXXFLAGS   = ${NODEBUGCXXFLAGS}
    59 # bigintm_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    6025
    6126if ENABLE_P_PROCS_DYNAMIC
    62   P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS} -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     27  P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
     28  # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    6329else
    64   P_PROCS_MODULE_LDFLAGS = ${AM_LDFLAGS}
     30  P_PROCS_MODULE_LDFLAGS =
    6531endif
    6632
    67 # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
    68 
    6933bigintm_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
    70 # bigintm_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
    71 
    7234
    7335# AM_COLOR_TESTS=always
    7436#
    7537# TESTS_ENVIRONMENT  = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables:${abs_builddir}/.libs:${abs_srcdir}'
    76 # TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}' 
     38# TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
    7739# TESTS_ENVIRONMENT += SINGULAR_BIN_DIR='${abs_top_builddir}/Singular'
    7840#
    7941# TESTS=test_release.sh
    8042#
    81 # # if WANT_DEBUG
    82 # # TESTS+=test_debug.sh
    83 # # endif
    84 #
    8543# EXTRA_DIST = test.sh $(TESTS)
    8644

  • dyn_modules/syzextra/Makefile.am

    rb3d84d rc70920  
    66-I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
    77-I${top_srcdir}/factory/include -I${top_builddir}/factory/include \
    8 $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
    9 
    10 AM_LDFLAGS = ${GOOGLE_PERFTOOL_LDFLAGS}
     8$(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)
    119
    1210module_LTLIBRARIES=syzextra.la
    … …  
    2523syzextra_la_SOURCES   = $(SOURCES)
    2624syzextra_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
    27 syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
     25syzextra_la_LDFLAGS   = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS} ${GOOGLE_PERFTOOL_LDFLAGS}
    2826
    2927# AM_COLOR_TESTS=always
    … …  
    3533# TESTS=test_release.sh
    3634#
    37 # # if WANT_DEBUG
    38 # # TESTS+=test_debug.sh
    39 # # endif
    40 #
    4135# EXTRA_DIST = syzextra.tst ederc.tst test_clear_enum.tst test.sh $(TESTS)

  • factory/Makefile.am

    rb3d84d rc70920  
    88lib_LTLIBRARIES = libfactory.la
    99
    10 libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
     10libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la \
     11${builddir}/../omalloc/libomalloc.la ${builddir}/../resources/libresources.la \
     12$(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
     13
    1114### libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    1215
    … …  
    224227EXTRA_PROGRAMS = gengftables
    225228gengftables_SOURCES = gengftables-conway.cc
    226 gengftables_LDADD = -L${builddir} -lfactory $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
     229gengftables_LDADD = libfactory.la $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
    227230
    228231

  • kernel/Makefile.am

    rb3d84d rc70920  
    11ACLOCAL_AMFLAGS = -I ../m4
    22# TODO: use ${top_srcdir} instead of .. in the above?
    3 
    4 
    53
    64libkernel_LTLIBRARIES = libkernel.la
    … …  
    3230libkernel_la_SOURCES   = $(SOURCES)
    3331
     32
    3433KERNELHEADERS = mod2.h polys.h hutil.h stairc.h ideals.h \
    3534        structs.h \
    … …  
    5453
    5554if ENABLE_FACTORY
    56   USE_FACTORY = -L${top_builddir}/factory
     55  USE_FACTORY = ${top_builddir}/factory/libfactory.la
    5756else
    5857  USE_FACTORY =
    5958endif
    6059
    61 AM_LDFLAGS = -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter  -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    62 
     60libkernel_la_LIBADD   =  ${top_builddir}/libpolys/polys/libpolys.la $(USE_FACTORY)
    6361
    6462### TODO: the following has to be addapted...
    … …  
    7169
    7270test_SOURCES = test.cc
    73 test_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc \
    74 $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) \
    75 ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     71test_LDADD = libkernel.la ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    7672
    7773

  • libpolys/coeffs/Makefile.am

    rb3d84d rc70920  
    2424  bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h
    2525
     26if ENABLE_FACTORY
     27  USE_FACTORY = ${top_builddir}/../factory/libfactory.la
     28else
     29  USE_FACTORY =
     30endif
     31
     32libcoeffs_la_LIBADD = ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la \
     33${USE_FACTORY} ${NTL_LIBS} ${GMP_LIBS}
     34
    2635TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    2736TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)'
    … …  
    3140check_PROGRAMS = $(TESTS)
    3241
    33 if ENABLE_FACTORY
    34   USE_FACTORY = -L${top_builddir}/../factory
    35 else
    36   USE_FACTORY =
    37 endif
    38 
    39 AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources
    4042
    4143test_SOURCES = test.cc
    42 test_LDADD   = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
     44test_LDADD   = libcoeffs.la

  • libpolys/configure.ac

    rb3d84d rc70920  
    3737LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
    3838LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
     39## LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
     40
    3941
    4042# Checks for library functions.
    … …  
    100102AX_PYTHON_WITH_VERSION([2.4])
    101103
     104AC_DEFINE_UNQUOTED([FACTORY_CFLAGS],"$FACTORY_CFLAGS",[FACTORY_CFLAGS])
     105AC_DEFINE_UNQUOTED([FACTORY_LIBS],"$FACTORY_LIBS",[FACTORY_LIBS])
     106
     107AC_DEFINE_UNQUOTED([NTL_CFLAGS],"$NTL_CFLAGS",[NTL_CFLAGS])
     108AC_DEFINE_UNQUOTED([NTL_LIBS],"$NTL_LIBS",[NTL_LIBS])
     109
     110AC_DEFINE_UNQUOTED([GMP_CFLAGS],"$GMP_CFLAGS",[GMP_CFLAGS])
     111AC_DEFINE_UNQUOTED([GMP_LIBS],"$GMP_LIBS",[GMP_LIBS])
     112
     113# AC_DEFINE_UNQUOTED([FLINT_CFLAGS],"$FLINT_CFLAGS",[FLINT_CFLAGS])
     114# AC_DEFINE_UNQUOTED([FLINT_LIBS],"$FLINT_LIBS",[FLINT_LIBS])
     115
    102116## AC_DEFINE([HAVE_POLYEXTENSIONS], [1], [Enable the algebraic & transcendental extensions])
    103117

  • libpolys/libpolys-config.in

    rb3d84d rc70920  
    8989
    9090    --cflags)
    91         ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG"
     91        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG"
    9292        ;;
    9393
    9494    --cflagswithdebug)
    95         ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
     95        ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
    9696        ;;
    9797
    9898    --libs)
    99         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys -lcoeffs -lreporter -lmisc @FACTORY_LIBS@ -lomalloc -lresources @FLINT_LIBS@ @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     99        ${ECHOn} " -L${libdir}/singular/libpolys.la"
    100100        ;;
    101101

  • libpolys/misc/Makefile.am

    rb3d84d rc70920  
    11ACLOCAL_AMFLAGS = -I ../../m4
    2 
    3 # CXXTEMPLFLAGS      =-ftrapv -fno-implicit-templates
    42
    53AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..  -DHAVE_CONFIG_H
    64
    7 # if WANT_DEBUG
    8 #   LIB_G=libmisc_g.la
    9 # else
    10 #   LIB_G=
    11 # endif
    12 
    135libmisc_LTLIBRARIES = libmisc.la
    14 # ${LIB_G}
    156libmiscdir = $(libdir)/singular
    167
    17 # libmisc_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    18 # libmisc_g_la_CFLAGS = ${PIPE}
    19 #
    20 # libmisc_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    21 # libmisc_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    22 # # -fdiagnostics-show-option
    23  
    24 # libmisc_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
    25 # libmisc_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    26 # libmisc_la_CPPFLAGS = ${AM_CPPFLAGS}
     8noinst_LTLIBRARIES = libintvec.la
    279
    28 
    29 noinst_LTLIBRARIES = libintvec.la
    30 # libintvec_g.la
    31 
    32 libmisc_la_LIBADD = libintvec.la
    33 # libmisc_g_la_LIBADD = libintvec_g.la
     10libmisc_la_LIBADD = libintvec.la \
     11${top_builddir}/../omalloc/libomalloc.la ${top_builddir}/../resources/libresources.la
    3412
    3513# libmisc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    3614
    37 SOURCES  = int64vec.cc options.c
    38 libmisc_la_SOURCES   = $(SOURCES)
    39 # libmisc_g_la_SOURCES = $(SOURCES)
    40 
     15libmisc_la_SOURCES   = int64vec.cc options.c
    4116
    4217libmisc_includedir = $(includedir)/singular/misc
    … …  
    4520
    4621nodist_libmisc_la_SOURCES   = auxiliary.h
    47 # nodist_libmisc_g_la_SOURCES = auxiliary.h
     22
     23libintvec_la_SOURCES = intvec.cc
    4824
    4925
    50 libintvec_la_SOURCES = intvec.cc
    51 # libintvec_g_la_SOURCES = ${libintvec_la_SOURCES}
    52 
    53 
    54 # libintvec_la_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} -fwrapv -fno-implicit-templates
    55 # libintvec_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} -fwrapv -fno-implicit-templates
    56 
    57 # libintvec_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
    58 # libintvec_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    59 # libintvec_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    60 

  • libpolys/polys/Makefile.am

    rb3d84d rc70920  
    11ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 # CXXTEMPLFLAGS =  ## -fno-implicit-templates
    4 #
    5 # DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    6 #
    7 # NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer
    8 # NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer
    9 # NODEBUGDEFS = -DSING_NDEBUG -DOM_NDEBUG
    103DEBUGCXXFLAGS   =
    114NODEBUGCFLAGS   =
    125NODEBUGCXXFLAGS =
    136NODEBUGDEFS     =
    14 
    15 # AM_CFLAGS     = ${PIPE}
    16 # AM_CXXFLAGS   = ${PIPE} ${CXXTEMPLFLAGS}
    177
    188AM_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 ${GMP_CFLAGS}  -DHAVE_CONFIG_H
    … …  
    3525endif
    3626
    37 # if WANT_DEBUG
    38 #   LIB_G=libpolys_g.la
    39 #   MOD_G=p_Procs_FieldGeneral_g.la p_Procs_FieldIndep_g.la p_Procs_FieldQ_g.la p_Procs_FieldZp_g.la
    40 # else
    41 #   LIB_G=
    42 #   MOD_G=
    43 # endif
    4427
    4528libpolys_LTLIBRARIES = libpolys.la
    46 # ${LIB_G}
    4729libpolysdir = $(libdir)/singular
    4830
    … …  
    8769p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
    8870
    89 # p_Procs_FieldGeneral_g_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON}
    90 # p_Procs_FieldIndep_g_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
    91 # p_Procs_FieldQ_g_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
    92 # p_Procs_FieldZp_g_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
    93 
    9471p_Procs_FieldGeneral_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
    9572p_Procs_FieldIndep_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
    9673p_Procs_FieldQ_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
    9774p_Procs_FieldZp_la_CXXFLAGS = ${NODEBUGCXXFLAGS}
    98 
    99 # p_Procs_FieldGeneral_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    100 # p_Procs_FieldIndep_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    101 # p_Procs_FieldQ_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    102 # p_Procs_FieldZp_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    10375
    10476P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -Wl,-undefined -Wl,dynamic_lookup -flat_namespace
    … …  
    10981p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
    11082
    111 # p_Procs_FieldGeneral_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
    112 # p_Procs_FieldIndep_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
    113 # p_Procs_FieldQ_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
    114 # p_Procs_FieldZp_g_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGSG}
    115 
    116 
    11783P_PROCS = templates/p_Procs_Lib.cc
    11884
    … …  
    12288p_Procs_FieldZp_la_SOURCES = ${P_PROCS}
    12389
    124 # p_Procs_FieldGeneral_g_la_SOURCES = ${P_PROCS}
    125 # p_Procs_FieldIndep_g_la_SOURCES = ${P_PROCS}
    126 # p_Procs_FieldQ_g_la_SOURCES = ${P_PROCS}
    127 # p_Procs_FieldZp_g_la_SOURCES = ${P_PROCS}
    12890
    129 
    130 # moduledir = $(bindir)
    13191moduledir = $(libexecdir)/singular/MOD
    13292
    13393if ENABLE_P_PROCS_DYNAMIC
    13494  module_LTLIBRARIES=p_Procs_FieldGeneral.la p_Procs_FieldIndep.la p_Procs_FieldQ.la p_Procs_FieldZp.la
    135  
    136 # if WANT_DEBUG
    137 #   module_LTLIBRARIES+=p_Procs_FieldGeneral_g.la p_Procs_FieldIndep_g.la p_Procs_FieldQ_g.la p_Procs_FieldZp_g.la
    138 # endif
    139 
    14095endif
    14196
    … …  
    145100
    146101libpolys_la_SOURCES = ${SOURCES}
    147 # libpolys_g_la_SOURCES = ${SOURCES}
    148102
    149103EXTRA_libpolys_la_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
    150104
    151 # libpolys_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    152105libpolys_la_CPPFLAGS = ${NODEBUGDEFS} ${AM_CPPFLAGS}
    153106
     107libpolys_la_LIBADD = ${top_builddir}/coeffs/libcoeffs.la
     108
    154109### libpolys_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    155 
    156110
    157111#################################################
    … …  
    162116noinst_PROGRAMS = templates/p_Procs_Generate
    163117templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
    164 # templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
    165 # templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
    166118templates_p_Procs_Generate_CPPFLAGS = ${USE_P_PROCS_STATIC} ${AM_CPPFLAGS}
    167 
    168 templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lresources
    169 templates_p_Procs_Generate_LDFLAGS  = -L${builddir} -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc -L${top_builddir}/../omalloc -L${top_builddir}/../resources
     119templates_p_Procs_Generate_LDADD    = ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la
    170120
    171121templates/p_Procs.inc: templates/p_Procs_Generate$(EXEEXT)

  • libpolys/reporter/Makefile.am

    rb3d84d rc70920  
    11ACLOCAL_AMFLAGS = -I ../../m4
    2 
    3 # CXXTEMPLFLAGS =-ftrapv 
    4 ## -fno-implicit-templates
    52
    63AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..  -DHAVE_CONFIG_H
    74
    8 # if WANT_DEBUG
    9 #   LIB_G=libreporter_g.la
    10 # else
    11 #   LIB_G=
    12 # endif
     5libreporter_LTLIBRARIES = libreporter.la
    136
    14 libreporter_LTLIBRARIES = libreporter.la
    15 # ${LIB_G}
    167libreporterdir = $(libdir)/singular
    178
    18 # libreporter_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    19 # libreporter_g_la_CFLAGS = ${PIPE}
    20 #
    21 # libreporter_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    22 # libreporter_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    23 # # -fdiagnostics-show-option
    24 
    25 # libreporter_la_CPPFLAGS   = ${AM_CPPFLAGS} -DSING_NDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    26 # libreporter_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    27 # libreporter_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    28 
    29 
    30 SOURCES  = dError.cc reporter.cc
    31 libreporter_la_SOURCES   = $(SOURCES)
    32 # libreporter_g_la_SOURCES = $(SOURCES)
     9libreporter_la_SOURCES   = dError.cc reporter.cc
    3310
    3411## libreporter_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    … …  
    3815libreporter_include_HEADERS   = reporter.h
    3916
     17libreporter_la_LIBADD = ${top_builddir}/misc/libmisc.la
    4018
    41 

  • numeric/Makefile.am

    rb3d84d rc70920  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 # if WANT_DEBUG
    4 #   LIB_G=libnumeric_g.la
    5 # else
    6 #   LIB_G=
    7 # endif
    8 #
    93libnumeric_LTLIBRARIES = libnumeric.la
    10 # ${LIB_G}
     4
    115libnumericdir = $(libdir)/singular
    12 
    13 # CXXTEMPLFLAGS =-ftrapv  ## -fno-implicit-templates
    14 #
    15 # libnumeric_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    16 # libnumeric_g_la_CFLAGS = ${PIPE}
    17 #
    18 # libnumeric_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    19 # libnumeric_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    20 # # -fdiagnostics-show-option
    216
    227AM_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}  -DHAVE_CONFIG_H
    238
    24 # libnumeric_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
    25 # libnumeric_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    26 # libnumeric_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    27 
    289SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc
    2910libnumeric_la_SOURCES   = $(SOURCES)
    30 # libnumeric_g_la_SOURCES = $(SOURCES)
     11
     12libnumeric_la_LIBADD = ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la
    3113
    3214### libnumeric_la_LDFLAGS    = -release ${PACKAGE_VERSION}

  • resources/Makefile.am

    rb3d84d rc70920  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 #if WANT_DEBUG
    4 #  LIB_G=libresources_g.la
    5 #else
    6 #  LIB_G=
    7 #endif
     3libresources_LTLIBRARIES = libresources.la
    84
    9 libresources_LTLIBRARIES = libresources.la
    10 # ${LIB_G}
    115libresourcesdir = $(libdir)
    126
    13 #CXXTEMPLFLAGS =-ftrapv
    14 ### -fno-implicit-templates
    15 
    16 #libresources_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    17 #libresources_g_la_CFLAGS = ${PIPE}
    18 
    19 #libresources_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS} -fno-exceptions -fno-rtti
    20 #libresources_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    21 # -fdiagnostics-show-option
    227
    238AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DHAVE_CONFIG_H
    249
    25 # libresources_la_CPPFLAGS   += ${AM_CPPFLAGS}
    26 
    27 #libresources_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
    28 #libresources_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    2910
    3011SOURCES  = omFindExec.c feResource.cc feFopen.cc
    3112libresources_la_SOURCES   = $(SOURCES)
    32 # libresources_g_la_SOURCES = $(SOURCES)
    3313
    3414### libresources_la_LDFLAGS    = -release ${PACKAGE_VERSION}
Note: See TracChangeset for help on using the changeset viewer.