Changeset 2c889f in git


Ignore:
Timestamp:
May 8, 2013, 4:12:34 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')
Children:
9ba92b7901662d0c96c6de7bab836cec2107c087
Parents:
02d3d641de579bc515b51a2769fe96f9149cd067
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-05-08 16:12:34+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-05-23 22:47:01+02:00
Message:
Code update corresponding to renaming findexec into resources
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r02d3d6 r2c889f  
    66endif
    77
    8 PACKAGES=findexec omalloc $(USE_FACTORY) libpolys kernel numeric Singular IntegerProgramming gfanlib dyn_modules dox
     8PACKAGES=resources omalloc $(USE_FACTORY) libpolys kernel numeric Singular IntegerProgramming gfanlib dyn_modules dox
    99
    1010SUBDIRS =$(PACKAGES)

  • Singular/Makefile.am

    r02d3d6 r2c889f  
    209209Singular Singularg ESingular TSingular $(optional_Singular_programs): ${abs_builddir}/LIB
    210210
    211 AMLDFLAGS = -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}/findexec
     211AMLDFLAGS = -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
    212212
    213213Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    … …  
    223223Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
    224224
    225 Singular_LDADD = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    226 Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     225Singular_LDADD = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     226Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    227227
    228228Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    … …  
    245245nodist_Singulardg_SOURCES =  libSingular_g.la
    246246
    247 Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    248 Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     247Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     248Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    249249
    250250Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    … …  
    261261ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO
    262262ESingular_LDFLAGS = -static ${AMLDFLAGS}
    263 ESingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec
     263ESingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
    264264
    265265ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
    … …  
    271271TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO
    272272TSingular_LDFLAGS = -static ${AMLDFLAGS}
    273 TSingular_LDADD =   -lreporter -lmisc -lomalloc -lfindexec
     273TSingular_LDADD =   -lreporter -lmisc -lomalloc -lresources
    274274
    275275TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
    … …  
    336336test_s_g_SOURCES = test.cc
    337337
    338 test_s_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    339 test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     338test_s_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     339test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    340340
    341341test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    … …  
    357357test_d_g_SOURCES = test.cc
    358358
    359 test_d_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    360 test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     359test_d_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
     360test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT_LDFLAGS}
    361361
    362362test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG

  • Singular/emacs.cc

    r02d3d6 r2c889f  
    2727#include <omalloc/omalloc.h>
    2828#include <Singular/version.h>
    29 #include <findexec/feResource.h>
     29#include <resources/feResource.h>
    3030#include <Singular/feOpt.h>
    3131

  • Singular/fehelp.cc

    r02d3d6 r2c889f  
    2222#include <reporter/reporter.h>
    2323
    24 #include <findexec/omFindExec.h>
     24#include <resources/omFindExec.h>
    2525
    2626#include <Singular/si_signals.h>

  • Singular/test.cc

    r02d3d6 r2c889f  
    1414#include <reporter/reporter.h>
    1515
    16 #include <findexec/feFopen.h>
    17 #include <findexec/feResource.h>
     16#include <resources/feFopen.h>
     17#include <resources/feResource.h>
    1818
    1919#include <coeffs/coeffs.h>

  • configure.ac

    r02d3d6 r2c889f  
    174174AC_CONFIG_FILES([dox/Makefile])
    175175
    176 AC_CONFIG_SUBDIRS([findexec])
     176AC_CONFIG_SUBDIRS([resources])
    177177AC_CONFIG_SUBDIRS([omalloc])
    178178

  • dyn_modules/bigintm/Makefile.am

    r02d3d6 r2c889f  
    3737AMLDFLAGS       =
    3838# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    39 # -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
     39# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    4040
    4141

  • dyn_modules/callgfanlib/Makefile.am

    r02d3d6 r2c889f  
    3232#AMLDFLAGS      =  -L${abs_top_builddir}/gfanlib/
    3333# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    34 # -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
     34# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    3535
    3636

  • dyn_modules/syzextra/Makefile.am

    r02d3d6 r2c889f  
    3636AMLDFLAGS       =
    3737# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
    38 # -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
     38# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/resources
    3939
    4040

  • factory/configure.ac

    r02d3d6 r2c889f  
    383383  if test "x$with_omalloc_extra_dir" != "x"; then
    384384    OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
    385     OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/findexec"
     385    OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/resources"
    386386  fi
    387387 
    … …  
    396396  CPPFLAGS="$CPPFLAGS_save"
    397397
    398   OMALLOC_G_LDADD="-lfindexec_g -lomalloc_g"
    399   OMALLOC_R_LDADD="-lfindexec -lomalloc"
     398  OMALLOC_G_LDADD="-lresources_g -lomalloc_g"
     399  OMALLOC_R_LDADD="-lresources -lomalloc"
    400400 
    401401  AC_DEFINE(HAVE_OMALLOC, 1, [omalloc support])

  • factory/singext.h

    r02d3d6 r2c889f  
    99#include <factory/cf_gmp.h>
    1010
    11 #include <findexec/feFopen.h>
     11#include <resources/feFopen.h>
    1212
    1313/*BEGINPUBLIC*/

  • factory/test.cc

    r02d3d6 r2c889f  
    11#include <factory/factory.h>
    2 #include <findexec/feFopen.h>
     2#include <resources/feFopen.h>
    33
    44int mmInit(void) {

  • kernel/Makefile.am

    r02d3d6 r2c889f  
    8686endif
    8787
    88 AMLDFLAGS = -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}/findexec
     88AMLDFLAGS = -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
    8989
    9090
    … …  
    110110test_s_g_SOURCES = $(testsources)
    111111
    112 test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    113 test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     112test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     113test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    114114
    115115test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    … …  
    129129test_d_g_SOURCES = $(testsources)
    130130
    131 test_d_r_LDADD = -lkernel -lpolys -lcoeffs  -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    132 test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g  -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     131test_d_r_LDADD = -lkernel -lpolys -lcoeffs  -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lresources $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     132test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g  -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lresources_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    133133
    134134test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG

  • kernel/febase.h

    r02d3d6 r2c889f  
    1010#include <reporter/reporter.h>
    1111
    12 #include <findexec/feResource.h>
     12#include <resources/feResource.h>
    1313
    1414#include <kernel/structs.h>

  • kernel/test.cc

    r02d3d6 r2c889f  
    1515#include <reporter/reporter.h>
    1616
    17 #include <findexec/feFopen.h>
    18 #include <findexec/feResource.h>
     17#include <resources/feFopen.h>
     18#include <resources/feResource.h>
    1919
    2020#include <coeffs/coeffs.h>

  • libpolys/coeffs/Makefile.am

    r02d3d6 r2c889f  
    5151endif
    5252
    53 AMLDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
     53AMLDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources
    5454
    5555TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    … …  
    7070
    7171
    72 test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    73 test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     72test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
     73test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS}
    7474
    75 test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    76 test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     75test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
     76test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS}
    7777
    7878

  • libpolys/coeffs/bigintmat.h

    r02d3d6 r2c889f  
    1010
    1111#include <omalloc/omalloc.h>
    12 #include <findexec/feFopen.h>
     12#include <resources/feFopen.h>
    1313#include <coeffs/coeffs.h>
    1414

  • libpolys/coeffs/test.cc

    r02d3d6 r2c889f  
    99
    1010#include <reporter/reporter.h>
    11 #include <findexec/feResource.h>
     11#include <resources/feResource.h>
    1212
    1313#include <coeffs/coeffs.h>

  • libpolys/libpolys-config.in

    r02d3d6 r2c889f  
    7979
    8080    --libsg)
    81         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g -lfindexec_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     81        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g -lresources_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    8282        ;;
    8383
    8484    --libs)
    85         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys -lcoeffs -lreporter -lmisc @FACTORY_LIBS@ -lomalloc -lfindexec @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     85        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys -lcoeffs -lreporter -lmisc @FACTORY_LIBS@ -lomalloc -lresources @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    8686        ;;
    8787

  • libpolys/misc/intvec.cc

    r02d3d6 r2c889f  
    1212#include <misc/auxiliary.h>
    1313
    14 // #include <findexec/feFopen.h>
     14// #include <resources/feFopen.h>
    1515#include <misc/intvec.h>
    1616#include <misc/options.h>

  • libpolys/polys/Makefile.am

    r02d3d6 r2c889f  
    160160templates_p_Procs_Generate_CPPFLAGS = ${NODEBUGDEFS} ${USE_P_PROCS_STATIC} ${AM_CPPFLAGS}
    161161
    162 templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lfindexec
    163 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}/../findexec
     162templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lresources
     163templates_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
    164164
    165165templates/p_Procs.inc: templates/p_Procs_Generate$(EXEEXT)

  • libpolys/polys/mod_raw.cc

    r02d3d6 r2c889f  
    2626#include <reporter/reporter.h>
    2727
    28 #include <findexec/feResource.h>
     28#include <resources/feResource.h>
    2929
    3030#include "mod_raw.h"

  • libpolys/reporter/reporter.cc

    r02d3d6 r2c889f  
    2121
    2222#include <reporter/reporter.h>
    23 #include <findexec/feResource.h>
    24 #include <findexec/feFopen.h>
     23#include <resources/feResource.h>
     24#include <resources/feFopen.h>
    2525#include <omalloc/omalloc.h>
    2626//#include "options.h"

  • libpolys/reporter/reporter.h

    r02d3d6 r2c889f  
    1010#include <string.h>
    1111#include <misc/auxiliary.h>
    12 #include <findexec/feFopen.h>
     12#include <resources/feFopen.h>
    1313
    1414extern char*  feErrors;

  • libpolys/tests/Makefile.am

    r02d3d6 r2c889f  
    105105endif
    106106
    107 AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
     107AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../resources
    108108
    109109
    … …  
    125125
    126126
    127 coeffs_test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    128 polys_test_s_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     127coeffs_test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
     128polys_test_s_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
    129129rings_test_s_r_LDADD = $(polys_test_s_r_LDADD)
    130130
    131 coeffs_test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    132 polys_test_s_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     131coeffs_test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS}
     132polys_test_s_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS}
    133133rings_test_s_g_LDADD = $(polys_test_s_g_LDADD)
    134134
    135 coeffs_test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    136 polys_test_d_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     135coeffs_test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
     136polys_test_d_r_LDADD = -lpolys -lcoeffs -lreporter -lmisc ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lresources ${NTL_LIBS} ${GMP_LIBS}
    137137rings_test_d_r_LDADD = $(polys_test_d_r_LDADD)
    138138
    139 coeffs_test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    140 polys_test_d_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     139coeffs_test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS}
     140polys_test_d_g_LDADD = -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lresources_g ${NTL_LIBS} ${GMP_LIBS}
    141141rings_test_d_g_LDADD = $(polys_test_d_g_LDADD)
    142142

  • libpolys/tests/coeffs_test.h

    r02d3d6 r2c889f  
    55
    66#include <reporter/reporter.h>
    7 #include <findexec/feResource.h>
     7#include <resources/feResource.h>
    88
    99#include <coeffs/coeffs.h>

  • libpolys/tests/common.h

    r02d3d6 r2c889f  
    1818
    1919#include <reporter/reporter.h>
    20 #include <findexec/feResource.h>
     20#include <resources/feResource.h>
    2121
    2222#ifndef PLURAL_INTERNAL_DECLARATIONS

  • libsingular-config.in

    r02d3d6 r2c889f  
    7777
    7878    --libsg)
    79         ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g -lfindexec_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     79        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lnumeric_g -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g @FACTORY_LIBS@ -lomalloc_g -lresources_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    8080        ;;
    8181
    8282    --libs)
    83         ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc @FACTORY_LIBS@ -lomalloc -lfindexec @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     83        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular -lnumeric -lkernel -lpolys -lcoeffs -lreporter -lmisc @FACTORY_LIBS@ -lomalloc -lresources @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    8484        ;;
    8585

  • resources/Makefile.am

    r02d3d6 r2c889f  
    22
    33if WANT_DEBUG
    4   LIB_G=libfindexec_g.la
     4  LIB_G=libresources_g.la
    55else
    66  LIB_G=
    77endif
    88
    9 libfindexec_LTLIBRARIES = libfindexec.la ${LIB_G}
    10 libfindexecdir = $(libdir)/
     9libresources_LTLIBRARIES = libresources.la ${LIB_G}
     10libresourcesdir = $(libdir)/
    1111
    1212CXXTEMPLFLAGS =-ftrapv
    1313### -fno-implicit-templates
    1414
    15 libfindexec_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    16 libfindexec_g_la_CFLAGS = ${PIPE}
     15libresources_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     16libresources_g_la_CFLAGS = ${PIPE}
    1717
    18 libfindexec_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS} -fno-exceptions -fno-rtti
    19 libfindexec_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
     18libresources_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS} -fno-exceptions -fno-rtti
     19libresources_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    2020# -fdiagnostics-show-option
    2121
    2222AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
    2323
    24 libfindexec_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    25 libfindexec_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     24libresources_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     25libresources_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    2626
    2727SOURCES  = omFindExec.c feResource.cc feFopen.cc
    28 libfindexec_la_SOURCES   = $(SOURCES)
    29 libfindexec_g_la_SOURCES = $(SOURCES)
     28libresources_la_SOURCES   = $(SOURCES)
     29libresources_g_la_SOURCES = $(SOURCES)
    3030
    31 libfindexec_includedir  =$(includedir)/findexec/
     31libresources_includedir  =$(includedir)/resources/
    3232
    33 libfindexec_include_HEADERS = omFindExec.h feResource.h feFopen.h
     33libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
    3434
    3535

  • resources/configure.ac

    r02d3d6 r2c889f  
    1 AC_INIT([libfindexec], [3.1.4.sw])
     1AC_INIT([libresources], [3.1.4.sw])
    22
    33AC_CONFIG_MACRO_DIR([../m4])

  • standalone.test/test.cc

    r02d3d6 r2c889f  
    66
    77#include <reporter/reporter.h>
    8 #include <findexec/feResource.h>
     8#include <resources/feResource.h>
    99
    1010#ifdef HAVE_FACTORY
Note: See TracChangeset for help on using the changeset viewer.