Changeset c0bbad in git


Ignore:
Timestamp:
Mar 19, 2014, 8:03:42 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
37e66f95be01e9f3d6e938257173798bc6a8dabe
Parents:
35f51c1498caac698f88edaebe09d65cb380aec7
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-03-19 20:03:42+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-03-19 21:44:40+01:00
Message:
Minor BS cleanup
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    r35f51c1 rc0bbad  
    159159# AC_DEFINE_UNQUOTED([AC_CT_CC], "$ac_ct_CC",[ac_ct_CC])
    160160
    161 AC_DEFINE_UNQUOTED([FACTORY_CFLAGS],"$FACTORY_CFLAGS",[FACTORY_CFLAGS])
    162 AC_DEFINE_UNQUOTED([FACTORY_LIBS],"$FACTORY_LIBS",[FACTORY_LIBS])
    163 
    164161AC_DEFINE_UNQUOTED([NTL_CFLAGS],"$NTL_CFLAGS",[NTL_CFLAGS])
    165162AC_DEFINE_UNQUOTED([NTL_LIBS],"$NTL_LIBS",[NTL_LIBS])

  • factory/configure.ac

    r35f51c1 rc0bbad  
    250250# for installation of the templates
    251251#templatedir='${includedir}/templates'
    252 
    253 #
    254 # - the name of the game and the targets to create.
    255 #
    256 #if test "x$with_Singular" = xyes; then
    257 #  libfactory=libfactory.a
    258 #
    259 #  factorysrc='$(basefactorysrc) $(singfactorysrc)'
    260 #  factoryincl='$(basefactoryincl) $(singfactoryincl)'
    261 #
    262 #  alltargets=cf
    263 #  installtargets=installcf
    264 #  uninstalltargets=uninstallcf
    265 #else
    266 #  libfactory=libcf.a
    267 #
    268 #  factorysrc='$(basefactorysrc)'
    269 #  factoryincl='$(basefactoryincl)'
    270 #
    271 #  alltargets=cf
    272 #  installtargets=installcf
    273 #  uninstalltargets=uninstallcf
    274 #fi
    275252
    276253#

  • libpolys/coeffs/Makefile.am

    r35f51c1 rc0bbad  
    66noinst_LTLIBRARIES = libcoeffs.la
    77###### libcoeffsdir = $(libdir)/singular
    8 
    98# noinst_HEADERS= \
    109#       gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h \
    … …  
    1211#       mpr_complex.h mpr_global.h
    1312
    14 
    1513SOURCES = \
    16         numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc \
    17         gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
    18         modulop.cc mpr_complex.cc \
     14  numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc \
     15  gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
     16  modulop.cc mpr_complex.cc \
    1917  bigintmat.cc  AE.cc OPAE.cc AEp.cc OPAEp.cc AEQ.cc OPAEQ.cc
    2018
    … …  
    2220
    2321libcoeffs_la_includedir  =$(includedir)/singular/coeffs
    24 libcoeffs_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 \
     22libcoeffs_la_include_HEADERS = \
     23  coeffs.h numbers.h si_gmp.h gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h rintegers.h rmodulo2m.h rmodulon.h \
     24  shortfl.h mpr_complex.h mpr_global.h \
    2525  bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h
    2626
    … …  
    3434${USE_FACTORY} ${NTL_LIBS} ${GMP_LIBS}
    3535
    36 ## libcoeffs_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    3736
    3837TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
    … …  
    4039
    4140TESTS = test
    42 
    4341check_PROGRAMS = $(TESTS)
    44 
    4542
    4643test_SOURCES = test.cc

  • libpolys/configure.ac

    r35f51c1 rc0bbad  
    102102AX_PYTHON_WITH_VERSION([2.4])
    103103
    104 AC_DEFINE_UNQUOTED([FACTORY_CFLAGS],"$FACTORY_CFLAGS",[FACTORY_CFLAGS])
    105 AC_DEFINE_UNQUOTED([FACTORY_LIBS],"$FACTORY_LIBS",[FACTORY_LIBS])
    106 
    107104AC_DEFINE_UNQUOTED([NTL_CFLAGS],"$NTL_CFLAGS",[NTL_CFLAGS])
    108105AC_DEFINE_UNQUOTED([NTL_LIBS],"$NTL_LIBS",[NTL_LIBS])

  • libpolys/polys/Makefile.am

    r35f51c1 rc0bbad  
    105105templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
    106106templates_p_Procs_Generate_CPPFLAGS = ${USE_P_PROCS_STATIC} ${AM_CPPFLAGS}
    107 templates_p_Procs_Generate_LDADD    = ${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la
     107templates_p_Procs_Generate_LDADD    = \
     108${top_builddir}/reporter/libreporter.la ${top_builddir}/misc/libmisc.la
    108109
    109110templates/p_Procs.inc: templates/p_Procs_Generate$(EXEEXT)

  • m4/options.m4

    r35f51c1 rc0bbad  
    6060
    6161if test "x$ENABLE_PLURAL" = xyes; then
    62   AC_DEFINE(HAVE_PLURAL,1,Enable non-commutative subsystem)
     62  AC_DEFINE(HAVE_PLURAL,[1],[Enable non-commutative subsystem])
    6363  #TODO make a seperate switch
    64   AC_DEFINE(HAVE_SHIFTBBA,1, [Enable letterplace])
     64  AC_DEFINE(HAVE_SHIFTBBA,[1],[Enable letterplace])
    6565fi
    6666
Note: See TracChangeset for help on using the changeset viewer.