Changeset c2eb2e in git


Ignore:
Timestamp:
Sep 28, 2011, 6:22:34 PM (13 years ago)
Author:
Volker Braun <vbraun.name@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')
Children:
a0acbc558a10c931620702cf1f67288945e04b23
Parents:
83db8d3000b4078b3fa1965f387d1f5099e5426e
git-author:
Volker Braun <vbraun.name@gmail.com>2011-09-28 18:22:34+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:44+01:00
Message:
make install and make distcheck work now
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r83db8d rc2eb2e  
    1414
    1515TESTDIRS=$(ALLOC) $(USE_FACTORY) libpolys kernel Singular
     16
     17# libfac doesn't use automake, just include it all in tarball
     18EXTRA_DIST = libfac

  • Singular/Makefile.am

    r83db8d rc2eb2e  
    1 # ACLOCAL_AMFLAGS = -I m4
    21# PIPE = -pipe
    32# ???
    … …  
    1918########################### libSingular* #########################
    2019
    21 lib_LIBRARIES = libSingular.a libSingular_g.a
     20libSingular_LIBRARIES = libSingular.a libSingular_g.a
     21libSingulardir = $(libdir)/singular
    2222
    2323libSingular_a_CFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE}
    … …  
    9797libSingular_g_a_SOURCES = $(SOURCES)
    9898
    99 libSingular_a_includedir  =${includedir}/Singular/
    100 libSingular_g_a_includedir=${includedir}/Singular/
    101 
    10299SingularHEADERS =    Cache.h \
    103100   CacheImplementation.h \
    … …  
    113110   distrib.h \
    114111   eigenval_ip.h \
    115    feOpt.h \
     112   feOpt.h feOptTab.h fehelp.h \
    116113   fglm.h \
    117114   gms.h \
    118115   grammar.h \
    119116   interpolation.h \
     117   idrec.h \
    120118   ipconv.h \
    121119   ipid.h \
    … …  
    125123   libparse.h \
    126124   libsingular.h \
     125   linearAlgebra_ip.h\
    127126   lists.h \
    128127   locals.h \
    … …  
    156155   tok.h \
    157156   utils.h \
     157   version.h \
    158158   walk.h \
    159159   feOpt.h feOpt.inc \
    160160   mpsr_Tok.inc iparith.inc feOptTS.inc feOptES.inc
    161161
    162 
    163 libSingular_a_include_HEADERS   = $(SingularHEADERS)
    164 libSingular_g_a_include_HEADERS = $(SingularHEADERS)
     162libSingular_includedir = ${includedir}/singular/Singular/
     163libSingular_include_HEADERS = $(SingularHEADERS)
    165164
    166165if ENABLE_FACTORY
    … …  
    179178AM_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/resources -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc
    180179
    181 EXTRA_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
     180noinst_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
    182181
    183182gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
    … …  
    194193gentable1_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
    195194
    196 # plural_cmd.inc: iparith.inc                         
    197 
    198195feOpt_SOURCES = feOptGen.cc feOptGen.h
    199196feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    … …  
    252249#########################################################
    253250
    254 BUILT_SOURCES = feOpt.inc mpsr_Tok.inc iparith.inc feOptTS.inc feOptES.inc  # files are built first
    255 # plural_cmd.inc
    256 
    257 CLEANFILES = $(TESTS) $(EXTRA_PROGRAMS) $(BUILT_SOURCES)
     251# These files are built first
     252BUILT_SOURCES = feOpt.inc mpsr_Tok.inc iparith.inc plural_cmd.inc feOptTS.inc feOptES.inc
     253
     254CLEANFILES = $(BUILT_SOURCES)
    258255
    259256feOpt.inc: feOpt
    … …  
    266263        ./feOptTS
    267264
    268 iparith.inc: gentable1
     265plural_cmd.inc iparith.inc: gentable1
    269266        ./gentable1
     267
     268# fake rule to fix parallel make http://www.gnu.org/s/hello/manual/automake/Multiple-Outputs.html
     269plural_cmd.inc: iparith.inc
    270270
    271271mpsr_Tok.inc: gentable2

  • configure.ac

    r83db8d rc2eb2e  
    1 AC_INIT([singular], [3.1.2.sw])
     1AC_INIT([singular], [3.1.3.sw])
    22
    33AC_CONFIG_MACRO_DIR([m4])

  • factory/Makefile.am

    r83db8d rc2eb2e  
    55lib_LIBRARIES = libfactory.a libfactory_g.a
    66
    7 libfactory_a_includedir=$(includedir)/factory
    8 libfactory_g_a_includedir=$(includedir)/factory
    9 
    10 libfactory_a_libdir=$(libdir)/factory
    11 libfactory_g_a_libdir=$(libdir)/factory
     7libfactory_a_libdir = $(libdir)
     8libfactory_g_a_libdir = $(libdir)
    129
    1310libfactory_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${CXXTEMPLFLAGS}
    … …  
    9087                singext.cc \
    9188                parseutil.cc \
    92                 ftmpl_inst.cc \
    93                 factory.h factoryconf.h
     89                ftmpl_inst.cc
    9490
    9591if WITH_PARSER_FOR_CANONICAL_FORM
    9692    SOURCES +=  readcf.yy
    9793endif
    98 
    9994
    10095libfactory_a_SOURCES = $(SOURCES)
    … …  
    106101                canonicalform.h \
    107102                cf_algorithm.h \
     103                cf_cyclo.h \
    108104                cf_binom.h \
    109105                cf_defs.h \
    … …  
    113109                cf_globals.h \
    114110                cf_gcd_smallp.h \
     111                cf_gmp.h \
    115112                cf_hnf.h \
    116113                cf_irred.h \
    117114                cf_iter.h \
    118115                cf_map.h \
     116                cf_map_ext.h \
    119117                cfNewtonPolygon.h \
    120118                cfModResultant.h \
    … …  
    168166                lgs.h \
    169167                algext.h \
    170                 singext.h
     168                singext.h \
     169                parseutil.h
    171170
    172171noinst_HEADERS = $(factory_headers)
     172
     173libfactory_includedir=$(includedir)/factory
     174libfactory_include_HEADERS = cplusplus.h factory.h factoryconf.h
     175
    173176
    174177# Documentation
    … …  
    185188                rm -rf doxygen
    186189
    187 # Support for building GF(q)-tables
    188 
    189 templatesrc =   \
    190                 ftmpl_array.cc \
    191                 ftmpl_factor.cc \
    192                 ftmpl_functions.h \
    193                 ftmpl_list.cc \
    194                 ftmpl_matrix.cc
    195 templateincl =  \
    196                 ftmpl_array.h \
    197                 ftmpl_factor.h \
    198                 ftmpl_list.h \
    199                 ftmpl_matrix.h
    200 
    201 # TODO:
    202 # gengftables needs libfactory.a and factory.h AND is needed for generating gftable...
    203 # somehow the current deps. seem to be broken...
    204 # moreover factory.h needs a lot more generated headers, which wouldn't be installed yet
    205 
    206 EXTRA_PROGRAMS = gengftables cplusplus
    207 
    208 
    209 gengftables_SOURCES = gengftables-conway.cc
    210 
    211 gengftables_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
     190# the precomputed GF(q)-tables
    212191
    213192gftablesdir=$(datadir)/gftables
    214 gftables_DATA = gftables/10201 gftables/1024 gftables/10609 gftables/11449 \
     193dist_gftables_DATA = gftables/10201 gftables/1024 gftables/10609 gftables/11449 \
    215194gftables/11881 gftables/121 gftables/12167 gftables/125 gftables/12769 \
    216195gftables/128 gftables/1331 gftables/1369 gftables/14641 \
    … …  
    235214
    236215
    237 gftables: gengftables
    238                 @if test -x ${srcdir}/gftables; then \
    239                         if test ! -x ${builddir}/gftables; then \
    240                           ln -snf ${srcdir}/gftables ${builddir}; \
    241                         fi; \
    242                 else \
    243                         echo "This command will take quite a long time to execute;"; \
    244                         echo "maybe you want to get the tables directly via ftp (see"; \
    245                         echo "the INSTALL file)."; \
    246                         ${builddir}/gengftables; \
    247                 fi
    248 
    249 .template.h:
    250         ${srcdir}/bin/makeheader $< $@
    251 
    252 BUILT_SOURCES = cplusplus.h factory.h factoryconf.h readcf.cc
    253 
    254 
    255 libfactory_a_include_HEADERS=$(BUILT_SOURCES)
    256 libfactory_g_a_include_HEADERS=$(BUILT_SOURCES)
     216# Support for building GF(q)-tables
     217#
     218# gengftables needs libfactory.a and factory.h AND is needed for
     219# generating gftable but the tables are not necessarily needed to
     220# compile and use libfactory (though it will be a lot slower).
     221
     222EXTRA_PROGRAMS = gengftables
     223gengftables_SOURCES = gengftables-conway.cc
     224gengftables_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
     225
    257226
    258227# These files listed below are not used anywhere but are included in
    259228# the distribution. So they will be tacked on to EXTRA_DIST.
    260229
     230templatesrc =   templates/ftmpl_array.cc \
     231                templates/ftmpl_factor.cc \
     232                templates/ftmpl_functions.h \
     233                templates/ftmpl_list.cc \
     234                templates/ftmpl_matrix.cc
     235
     236templateincl =  templates/ftmpl_array.h \
     237                templates/ftmpl_factor.h \
     238                templates/ftmpl_list.h \
     239                templates/ftmpl_matrix.h
     240
    261241# header templates
    262 hdrtemplsrc = \
    263                 factoryconf.template \
     242hdrtemplsrc =   factoryconf.template \
    264243                factory.template
    265244
    266245# FTE source files
    267 ftestsrc =      \
    268                 ftest_io.cc \
    269                 ftest_util.cc \
    270                 ntl_util.cc
     246ftestsrc =      ftest/ftest_io.cc \
     247                ftest/ftest_util.cc \
     248                ftest/ntl_util.cc
    271249
    272250# FTE header files
    273 ftestincl =     \
    274                 ftest_io.h \
    275                 ftest_util.h \
    276                 ntl_util.h
    277 
    278 # FTE m4 source files (exported for `GNUmakefile' in `ftest/').
    279 # The variable `$(ftestm4develsrc)' may be already initialized
    280 # from the development `GNUmakefile'.
    281 ftestm4src =    $(ftestm4develsrc) \
    282                 commonden.m4 \
    283                 degree.m4 \
    284                 deriv.m4 \
    285                 divides.m4 \
    286                 divrem.m4 \
    287                 extgcd.m4 \
    288                 factorize.m4 \
    289                 fbinops.m4 \
    290                 feval.m4 \
    291                 gcd.m4 \
    292                 gcd.ntl.m4 \
    293                 insert.m4 \
    294                 norm.m4 \
    295                 resultant.m4 \
    296                 revert.m4 \
    297                 sqrfree.m4 \
    298                 size.m4 \
    299                 totaldegree.m4
    300 
    301 # other files from the FTE
     251ftestincl =     ftest/ftest_io.h \
     252                ftest/ftest_util.h \
     253                ftest/ntl_util.h
     254
     255ftestm4src =    ftest/commonden.m4 \
     256                ftest/degree.m4 \
     257                ftest/deriv.m4 \
     258                ftest/divides.m4 \
     259                ftest/divrem.m4 \
     260                ftest/extgcd.m4 \
     261                ftest/factorize.m4 \
     262                ftest/fbinops.m4 \
     263                ftest/feval.m4 \
     264                ftest/gcd.m4 \
     265                ftest/gcd.ntl.m4 \
     266                ftest/insert.m4 \
     267                ftest/norm.m4 \
     268                ftest/resultant.m4 \
     269                ftest/revert.m4 \
     270                ftest/sqrfree.m4 \
     271                ftest/size.m4 \
     272                ftest/totaldegree.m4
     273
    302274ftestdistfiles = \
    303                 ftest_util.m4
    304 
    305 # gengftables.cc gengftables-conway.cc
     275                ftest/ftest_util.m4
     276
    306277EXTRA_DIST =    test_install.cc \
    307278                $(templatesrc) $(templateincl) $(hdrtemplsrc) \
    308279                $(ftestsrc) $(ftestincl) $(ftestm4src) $(ftestdistfiles) \
    309                 doxygen.cfg factory.cfg gen_cf_gmp.template \
     280                doxygen.cfg factory.cfg \
    310281                examples/application.cc \
    311282                examples/factorize.cc examples/gcd.cc \
    312283                bin/folding.el bin/fold-docu.el \
    313                 bin/makeheader bin/gen-readcf $(gftables_DATA)
    314 
    315 CLEANFILES = factory.h factoryconf.h cplusplus.h readcf.cc
    316 
    317 
     284                bin/makeheader bin/gen-readcf
     285
     286##################################################
     287# autogenerated sources
     288
     289noinst_PROGRAMS = cplusplus
     290
     291BUILT_SOURCES = cplusplus.h factory.h factoryconf.h readcf.cc
     292
     293CLEANFILES = $(BUILT_SOURCES)
    318294
    319295cplusplus_SOURCES = cplusplus.cc
    … …  
    322298        ${builddir}/cplusplus > ${builddir}/cplusplus.h
    323299
    324 #ftmpl_inst.o:  ftmpl_inst.cc factoryconf.h factory.h \
    325 #               $(addprefix templates/,$(templatesrc)) \
    326 #               $(addprefix templates/,$(templateincl))
    327 #               $(CXX) -c $< $(libfactory_a_CXXFLAGS)  $(INCLUDES) -o $@
     300.template.h:
     301        ${srcdir}/bin/makeheader $< $@
     302
     303# factory/gfops.cc has the gftables path hardcoded in, so we create a
     304# symlink. Remove this rule once gfopts.cc has been fixed. Note that
     305# check-local would run in parallel with check, so we can't use it
     306# here!
     307all-local:
     308        [ -d ${builddir}/gftables ] || ln -s ${srcdir}/gftables ${builddir}
    328309
    329310####################################################
    … …  
    335316TESTSSOURCES = test.cc
    336317
    337 test_g: libfactory_g.a
    338 
    339318test_g_SOURCES = $(TESTSSOURCES)
    340319test_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer --no-rtti #ftmpl_inst.o
    341320test_g_LDADD = -L${builddir} -lfactory_g $(GMP_LIBS) $(NTL_LIBS)
    342321
    343 test_r: libfactory.a
    344 
    345322test_r_SOURCES = $(TESTSSOURCES)
    346323test_r_CFLAGS = -O3 -fomit-frame-pointer --no-rtti #ftmpl_inst.o
    347324test_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
     325

  • factory/configure.ac

    r83db8d rc2eb2e  
    422422    [test x$with_Singular != xyes && test x$enable_streamio != xno])
    423423
    424 AC_OUTPUT(Makefile ftest/GNUmakefile)
    425 
     424AC_CONFIG_FILES([Makefile ftest/GNUmakefile])
     425AC_OUTPUT
     426

  • kernel/Makefile.am

    r83db8d rc2eb2e  
    1010
    1111
    12 
    1312CXXTEMPLFLAGS = --no-exceptions ## -fno-implicit-templates
    1413
    15 
    16 lib_LIBRARIES = libkernel.a libkernel_g.a
    17 
     14libkernel_LIBRARIES = libkernel.a libkernel_g.a
     15libkerneldir = $(libdir)/singular
    1816
    1917libkernel_a_CFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE}
    … …  
    5048    f5c.cc ratgring.cc shiftgb.cc gfan.cc \
    5149    linearAlgebra.cc nc.cc preimage.cc \
    52     fegetopt.c kInline.h
     50    fegetopt.c
    5351
    5452libkernel_a_SOURCES   = $(SOURCES)
    5553libkernel_g_a_SOURCES = $(SOURCES)
    56 
    57 libkernel_a_includedir  =${includedir}/kernel/
    58 libkernel_g_a_includedir=${includedir}/kernel/
    5954
    6055KERNELHEADERS = polys.h hutil.h stairc.h ideals.h \
    … …  
    7267        fegetopt.h \
    7368        ratgring.h shiftgb.h nc.h \
    74         gfan.h preimage.h
     69        gfan.h preimage.h mod2.h longrat.h timer.h kInline.h modulop.h fast_mult.h \
     70        digitech.h tgb.h ringgb.h tgbgauss.h tgb_internal.h \
     71        linearAlgebra.h page.h
    7572
    76 libkernel_a_include_HEADERS   = $(KERNELHEADERS)
    77 libkernel_g_a_include_HEADERS = $(KERNELHEADERS)
    78 
     73libkernel_includedir  =${includedir}/singular/kernel/
     74libkernel_include_HEADERS   = $(KERNELHEADERS)
    7975
    8076if ENABLE_FACTORY
    … …  
    9995testg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    10096
    101 testr_SOURCES = test.cc
    102 testg_SOURCES = test.cc
     97testsources = test.cc f5c.h f5data.h f5gb.h f5lists.h
     98testr_SOURCES = $(testsources)
     99testg_SOURCES = $(testsources)
    103100
    104101testr_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    … …  
    112109
    113110
    114 # noinst_HEADERS =
    115 

  • libpolys/Makefile.am

    r83db8d rc2eb2e  
    22
    33bin_SCRIPTS = libpolys-config
    4 
    5 libpoly_libincludedir = $(libdir)/libpolys/include
    6 nodist_libpoly_libinclude_HEADERS = config.h
    7 
    84
    95PACKAGES=misc reporter resources coeffs polys tests

  • libpolys/coeffs/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES = libcoeffs.a libcoeffs_g.a
     1libcoeffs_LIBRARIES = libcoeffs.a libcoeffs_g.a
     2libcoeffsdir = $(libdir)/singular
     3
    24CXXTEMPLFLAGS =  --no-exceptions
    35## -fno-implicit-templates
    … …  
    2931libcoeffs_g_a_SOURCES = $(SOURCES)
    3032
    31 ## include_HEADERS = coeffs.h numbers.h
    32 
    33 libcoeffs_a_includedir  =$(includedir)/libpolys/coeffs
    34 libcoeffs_g_a_includedir=$(includedir)/libpolys/coeffs
    35 
    36 COEFFSHEADERS  = coeffs.h numbers.h si_gmp.h
    37 libcoeffs_a_include_HEADERS   = $(COEFFSHEADERS)
    38 libcoeffs_g_a_include_HEADERS = $(COEFFSHEADERS)
    39 
     33libcoeffs_includedir  =$(includedir)/singular/coeffs
     34libcoeffs_include_HEADERS = coeffs.h numbers.h si_gmp.h
    4035
    4136if ENABLE_FACTORY

  • libpolys/misc/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libmisc.a libmisc_g.a
     1libmisc_LIBRARIES = libmisc.a libmisc_g.a
     2libmiscdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libmisc_g_a_SOURCES = $(SOURCES)
    2021
    21 libmisc_a_includedir  =$(includedir)/libpolys/misc
    22 libmisc_g_a_includedir=$(includedir)/libpolys/misc
    23 
    24 ###????
    25 #libmisc_a_libdir  =${libdir}/libpolys
    26 #libmisc_g_a_libdir=${libdir}/libpolys
    27 
    28 MISCHEADERS  = auxiliary.h mylimits.h options.h intvec.h int64vec.h
    29 libmisc_a_include_HEADERS   = $(MISCHEADERS)
    30 libmisc_g_a_include_HEADERS = $(MISCHEADERS)
     22libmisc_includedir = $(includedir)/singular/misc
     23libmisc_include_HEADERS = auxiliary.h mylimits.h options.h intvec.h int64vec.h
    3124
    3225
    3326
     27

  • libpolys/polys/Makefile.am

    r83db8d rc2eb2e  
    11CXXTEMPLFLAGS   =  --no-exceptions ## -fno-implicit-templates
    2 
    32
    43DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    … …  
    2827endif
    2928
    30 prCopy.inc: prCopy.pl
    31         perl ${srcdir}/prCopy.pl >  prCopy.inc
    32 
    33 lib_LIBRARIES=libpolys.a libpolys_g.a
    34 
    35 libpolys_a_includedir=$(includedir)/libpolys/polys
    36 libpolys_g_a_includedir=$(includedir)/libpolys/polys
     29libpolys_LIBRARIES = libpolys.a libpolys_g.a
     30libpolysdir = $(libdir)/singular
    3731
    3832SOURCES = \
    3933        monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
    40         operations/pShallowCopyDelete.cc operations/p_Mult_q.cc operations/p_Mult_q.h \
    41         templates/p_Procs_Lib.cc templates/p_MemCmp.h templates/p_MemCopy.h templates/p_Numbers.h \
    42         templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
    43         templates/p_Procs_Impl.h \
     34        operations/pShallowCopyDelete.cc operations/p_Mult_q.cc \
    4435        nc/sca.cc nc/summator.cc nc/ncSAFormula.cc nc/ncSACache.cc nc/ncSAMult.cc \
    4536        pDebug.cc polys0.cc prCopy.cc prCopyMacros.h \
    4637        kbuckets.cc sbuckets.cc weight.cc weight0.c simpleideals.cc matpol.cc \
    4738        sparsmat.cc \
    48         ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC}  mod_raw.cc \
    49         ext_fields/algext.cc ext_fields/algext.h \
    50         ext_fields/transext.cc clapsing.cc clapconv.cc \
     39        ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} mod_raw.cc \
     40        ext_fields/algext.cc ext_fields/transext.cc \
     41        clapsing.cc clapconv.cc \
    5142        nc/old.gring.cc
    52 
    53 #       OLD?:
    54 
    55 BUILT_SOURCES = prCopy.inc templates/p_Procs.inc
    56 
    57 noinst_HEADERS =
    5843
    5944LIBPOLYSHEADERS = monomials/ring.h monomials/monomials.h \
    6045        nc/nc.h nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
    61         operations/pShallowCopyDelete.h \
    62         templates/p_MemAdd.h \
     46        operations/pShallowCopyDelete.h operations/p_Mult_q.h \
    6347        templates/p_Procs.h mod_raw.h \
    6448        monomials/p_polys.h monomials/maps.h prCopy.h \
    6549        kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
    66         sparsmat.h clapsing.h clapconv.h
     50        sparsmat.h clapsing.h clapconv.h coeffrings.h \
     51        ext_fields/algext.h ext_fields/transext.h
    6752
    68 ### nobase_include_HEADERS = $(LIBPOLYSHEADERS)
    69 
    70 
     53EXTRA_DIST = \
     54        prCopy.pl prCopyTemplate.cc \
     55        templates/p_Procs_Lib.cc templates/p_MemCmp.h templates/p_MemCopy.h templates/p_Numbers.h \
     56        templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
     57        templates/p_Procs_Impl.h templates/p_Delete__T.cc templates/p_Copy__T.cc \
     58        templates/p_ShallowCopyDelete__T.cc templates/p_MemAdd.h templates/p_Mult_nn__T.cc \
     59        templates/pp_Mult_nn__T.cc templates/pp_Mult_mm__T.cc templates/p_Mult_mm__T.cc \
     60        templates/pp_Mult_Coeff_mm_DivSelect__T.cc templates/pp_Mult_nn__T.cc \
     61        templates/pp_Mult_Coeff_mm_DivSelectMult__T.cc \
     62        templates/pp_Mult_mm_Noether__T.cc \
     63        templates/p_kBucketSetLm__T.cc templates/p_Minus_mm_Mult_qq__T.cc \
     64        templates/p_Merge_q__T.cc templates/p_Add_q__T.cc templates/p_Neg__T.cc
    7165
    7266P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
    … …  
    121115
    122116
    123 moduledir = $(libdir)/libpolys/MOD/
     117moduledir = $(libdir)/singular/MOD/
    124118
    125119if ENABLE_P_PROCS_DYNAMIC
    … …  
    128122endif
    129123
     124libpolys_includedir=$(includedir)/singular/polys
    130125
    131 nobase_libpolys_a_include_HEADERS = $(LIBPOLYSHEADERS)
    132 nobase_libpolys_g_a_include_HEADERS = $(LIBPOLYSHEADERS)
    133 
     126libpolys_include_HEADERS = $(LIBPOLYSHEADERS)
    134127
    135128libpolys_a_SOURCES = ${SOURCES}
    136129libpolys_g_a_SOURCES = ${SOURCES}
    137130
    138 ## libpolys_adir = $(libdir)/libpolys
    139 ## libpolys_g_adir = $(libdir)/libpolys
    140 
    141131EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
    142132
    143 EXTRA_PROGRAMS = templates/p_Procs_Generate
    144 templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
     133libpolys_g_a_CXXFLAGS = ${DEBUGCXXFLAGS}
     134libpolys_a_CPPFLAGS = ${NODEBUGDEFS}
    145135
    146136
    147 ###test_LDADD   = libcoeffs.a -lresources -lreporter -lgmp -lomalloc
     137#################################################
     138# autogenerated sources
    148139
     140BUILT_SOURCES = prCopy.inc templates/p_Procs.inc
     141
     142noinst_PROGRAMS = templates/p_Procs_Generate
     143templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
    149144templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
    150145templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
    … …  
    156151        ${builddir}/templates/p_Procs_Generate > ${builddir}/templates/p_Procs.inc
    157152
    158 libpolys_g_a_CXXFLAGS = ${DEBUGCXXFLAGS}
    159 libpolys_a_CPPFLAGS = ${NODEBUGDEFS}
     153prCopy.inc: prCopy.pl
     154        perl ${srcdir}/prCopy.pl >  prCopy.inc
    160155
    161 #  -fdiagnostics-show-option
     156CLEANFILES = $(BUILT_SOURCES)
    162157
    163 dynamic_modules: ${module_LTLIBRARIES}
    164 

  • libpolys/reporter/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libreporter.a libreporter_g.a
     1libreporter_LIBRARIES=libreporter.a libreporter_g.a
     2libreporterdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libreporter_g_a_SOURCES = $(SOURCES)
    2021
    21 libreporter_a_includedir  =$(includedir)/libpolys/reporter
    22 libreporter_g_a_includedir=$(includedir)/libpolys/reporter
     22libreporter_includedir  =$(includedir)/singular/reporter
    2323
    24 REPORTERHEADERS = reporter.h
    25 libreporter_a_include_HEADERS   = $(REPORTERHEADERS)
    26 libreporter_g_a_include_HEADERS = $(REPORTERHEADERS)
     24libreporter_include_HEADERS   = reporter.h
    2725
    2826

  • libpolys/resources/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libresources.a libresources_g.a
     1libresources_LIBRARIES=libresources.a libresources_g.a
     2libresourcesdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libresources_g_a_SOURCES = $(SOURCES)
    2021
    21 libresources_a_includedir  =$(includedir)/libpolys/resources
    22 libresources_g_a_includedir=$(includedir)/libpolys/resources
     22libresources_includedir  =$(includedir)/singular/resources
    2323
    24 RESOURCESHEADERS  = feFopen.h feResource.h
    25 libresources_a_include_HEADERS   = $(RESOURCESHEADERS)
    26 libresources_g_a_include_HEADERS = $(RESOURCESHEADERS)
     24libresources_include_HEADERS   = feFopen.h feResource.h
    2725
    2826

  • libpolys/tests/Makefile.am

    r83db8d rc2eb2e  
    2323
    2424simple_test_SOURCES = simple_test_runner.cpp
    25 coeffs_test_SOURCES = coeffs_test_runner.cpp gftables
    26 polys_test_SOURCES = polys_test_runner.cpp gftables MOD
    27 rings_test_SOURCES = rings_test_runner.cpp gftables MOD
    28 
    29 
     25coeffs_test_SOURCES = coeffs_test_runner.cpp
     26polys_test_SOURCES = polys_test_runner.cpp
     27rings_test_SOURCES = rings_test_runner.cpp
    3028
    3129polys_test_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS}
    … …  
    3735
    3836
    39 BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)
     37BUILT_SOURCES = gftables MOD \
     38        $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)
    4039
    4140gftables: ${top_srcdir}/../factory/gftables
    … …  
    5958
    6059CLEANFILES = $(BUILT_SOURCES)
     60
     61EXTRA_DIST = simple_test.h coeffs_test.h polys_test.h rings_test.h common.h             \
     62    cxxtest/Descriptions.h       cxxtest/ParenPrinter.h      cxxtest/TestListener.h     \
     63    cxxtest/DummyDescriptions.h  cxxtest/QtGui.h             cxxtest/TestRunner.h       \
     64    cxxtest/ErrorFormatter.h     cxxtest/RealDescriptions.h  cxxtest/TestSuite.h        \
     65    cxxtest/ErrorPrinter.h       cxxtest/SelfTest.h          cxxtest/TestTracker.h      \
     66    cxxtest/Flags.h              cxxtest/StdHeaders.h        cxxtest/ValueTraits.h      \
     67    cxxtest/GlobalFixture.h      cxxtest/StdioFilePrinter.h  cxxtest/Win32Gui.h         \
     68    cxxtest/Gui.h                cxxtest/StdioPrinter.h      cxxtest/X11Gui.h           \
     69    cxxtest/LinkedList.h         cxxtest/StdValueTraits.h    cxxtest/YesNoRunner.h      \
     70    cxxtest/Mock.h               cxxtest/TeeListener.h                                  \
     71    cxxtest/Descriptions.cpp     cxxtest/LinkedList.cpp      cxxtest/TestSuite.cpp      \
     72    cxxtest/DummyDescriptions.cpp cxxtest/RealDescriptions.cpp  cxxtest/TestTracker.cpp \
     73    cxxtest/GlobalFixture.cpp    cxxtest/Root.cpp            cxxtest/ValueTraits.cpp

  • numeric/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libnumeric.a libnumeric_g.a
     1libnumeric_LIBRARIES = libnumeric.a libnumeric_g.a
     2libnumericdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libnumeric_g_a_SOURCES = $(SOURCES)
    2021
    21 libnumeric_a_includedir  =$(includedir)/numeric/
    22 libnumeric_g_a_includedir=$(includedir)/numeric/
     22libnumeric_includedir  =$(includedir)/singular/numeric/
    2323
    24 NUMERICHEADERS = mpr_base.h mpr_inout.h mpr_numeric.h
    25 
    26 libnumeric_a_include_HEADERS   = $(NUMERICHEADERS)
    27 libnumeric_g_a_include_HEADERS = $(NUMERICHEADERS)
     24libnumeric_include_HEADERS = mpr_base.h mpr_inout.h mpr_numeric.h
    2825
    2926

  • omalloc/Makefile.am

    r83db8d rc2eb2e  
     1ACLOCAL_AMFLAGS = -I ../m4
    12AM_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
    23
    34lib_LIBRARIES=libomalloc.a libomalloc_g.a
    45
    5 libomalloc_a_includedir=$(includedir)/omalloc
     6libomalloc_includedir=$(includedir)/omalloc
    67
    7 libomalloc_a_include_HEADERS=\
     8libomalloc_include_HEADERS = \
    89omalloc.h               omConfig.h              omDerivedConfig.h       \
    910omError.h               omStructs.h             omAllocDecl.h           \
    … …  
    1516omAllocFunc.h           omlimits.h              mylimits.h
    1617
    17 
    18 
    19 noinst_HEADERS= omPage.h omDefaultConfig.h omReturn.h
     18noinst_HEADERS= omPage.h omDefaultConfig.h omReturn.h omGetPageSize.h \
     19  omMalloc.h omMallocSystem.h
    2020
    2121SOURCES=\
    … …  
    2323om_Alloc.c        omDebugCheck.c   omOpts.c         omGetBackTrace.c \
    2424omAllocSystem.c   omError.c        omStats.c        omRet2Info.c     \
    25 omBin.c           omFindExec.c     omDebugTrack.c                    \
     25omBin.c           omFindExec.c     omDebugTrack.c                    \
    2626omalloc_provide.c omAllocFunc.c
     27
     28EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h
    2729
    2830INCLUDES=-I${top_srcdir}/.. -I${top_builddir}/..
    … …  
    3133libomalloc_g_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
    3234
    33 nodist_libomalloc_a_SOURCES = omConfig.h omlimits.h mylimits.h omTables.h omalloc.h omTables.inc
    34 nodist_libomalloc_g_a_SOURCES = omConfig.h omlimits.h omTables.h omalloc.h omTables.inc
     35nodist_libomalloc_a_SOURCES = omConfig.h omlimits.h mylimits.h omalloc.h omTables.inc
     36nodist_libomalloc_g_a_SOURCES = omConfig.h omlimits.h omalloc.h omTables.inc
    3537
    3638libomalloc_a_CPPFLAGS= -DOM_NDEBUG
    … …  
    4850omTables_CPPFLAGS = -DOM_GENERATE_INC
    4951
     52CLEANFILES = $(BUILT_SOURCES)
     53
    5054####################################################
    5155## Test program
    … …  
    5458check_PROGRAMS = $(TESTS)
    5559
    56 OMTTESTSSOURCES = omtTestReal.c omtTestDebug.c omtTestKeep.c omtTestError.c omtTest.c 
     60OMTTESTSSOURCES = omtTestReal.c omtTestDebug.c omtTestKeep.c omtTestError.c omtTest.c
    5761
    5862omtTest_g: libomalloc_g.a

  • omalloc/configure.ac

    r83db8d rc2eb2e  
    11dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    2 dnl File: configure.in
     2dnl File: configure.ac
    33dnl Purpose: Process this file with autoconf to produce configure
    44dnl Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
    … …  
    516516
    517517AC_MSG_CHECKING(whether to track return addresses)
    518 if test "$with_track_return" = no || test "$ac_cv_get_return_addr_works" = no || test "$ac_cv_prog_addr2line_works" != yes; then
     518if test "$with_track_return" = no || test "$ac_cv_get_return_addr_works" = no || test "$ac_cv_prog_addr2line_works "!= yes; then
    519519  with_track_return=no
    520520else
    … …  
    582582dnl
    583583AC_CONFIG_HEADER(config.h omConfig.h omlimits.h)
    584 
    585 AC_OUTPUT(Makefile, \
    586  if test "$CONFIG_HEADERS"; then echo timestamp > stamp-h; fi)
    587 
    588 
     584AC_CONFIG_FILES([Makefile])
     585AC_OUTPUT
     586
Note: See TracChangeset for help on using the changeset viewer.