Changeset 86b7aca in git


Ignore:
Timestamp:
Sep 13, 2011, 9:02:52 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')
Children:
207e0b5049d84b076f3338c694dca299e831cbd4
Parents:
3aea089efd1ccd3c6daa1855e3394ff462d8f1fb
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-13 21:02:52+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:46+01:00
Message:
CHG: minor changes to the build system
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r3aea08 r86b7aca  
    4242libpolys/polys/templates/p_Procs.inc
    4343libpolys/polys/m4/
    44 libpolys/coeffs/tt-r
    45 libpolys/coeffs/tt-g
    4644libpolys/polys/templates/.dirstamp
    4745libpolys/libpolys-config

  • Makefile.am

    r3aea08 r86b7aca  
     1ACLOCAL_AMFLAGS = -I m4
     2
    13ALLOC=omalloc
    2 
    34
    45if ENABLE_FACTORY

  • kernel/Makefile.am

    r3aea08 r86b7aca  
    77#STATIC_LDFLAGS = -static
    88
     9ACLOCAL_AMFLAGS = -I ${top_srcdir}/m4
    910
    1011

  • libpolys/coeffs/Makefile.am

    r3aea08 r86b7aca  
    1 lib_LIBRARIES=libcoeffs.a libcoeffs_g.a
    2 CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
     1lib_LIBRARIES = libcoeffs.a libcoeffs_g.a
     2CXXTEMPLFLAGS =  --no-exceptions
     3## -fno-implicit-templates
    34
    45libcoeffs_a_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    … …  
    4748AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc
    4849
    49 TESTS = tt-g tt-r
     50
     51TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
     52TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)'
     53
     54
     55TESTS = testg testr
    5056check_PROGRAMS = $(TESTS)
    5157
    52 tt_r_SOURCES = test.cc
    53 tt_g_SOURCES = test.cc
     58testr_SOURCES = test.cc
     59testg_SOURCES = test.cc
    5460
    55 tt_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
    56 tt_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
     61testr_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
     62testg_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
    5763
    58 tt_r: gftables
    59 tt_g: gftables
    6064
    61 tt_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    62 tt_g_CFLAGS = ${PIPE}
     65# testr: libcoeffs.a
     66# testg: libcoeffs_g.a
     67# gftables
    6368
    64 tt_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS} -fimplicit-templates
    65 tt_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS} -fimplicit-templates
     69testr_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     70testg_CFLAGS = ${PIPE}
     71
     72testr_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     73# -fimplicit-templates
     74testg_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
     75# -fimplicit-templates
    6676# -fdiagnostics-show-option
    6777
    68 tt_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    69 tt_g_CPPFLAGS = -DHAVE_CONFIG_H
     78testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     79testg_CPPFLAGS = -DHAVE_CONFIG_H
    7080
    71 gftables: ${top_srcdir}/../factory/gftables
    72         ln -snf ${top_srcdir}/../factory/gftables ${builddir}
     81#gftables: ${top_srcdir}/../factory/gftables
     82#       ln -snf ${top_srcdir}/../factory/gftables ${builddir}

  • libpolys/configure.ac

    r3aea08 r86b7aca  
    8383AC_DEFINE([NOSTREAMIO],[1],[DISABLE_GMP_CPP])
    8484
    85 AC_SUBST(LIBPREFIX)
    86 
    8785AC_CONFIG_FILES([Makefile])
    8886AC_CONFIG_FILES([misc/Makefile])
Note: See TracChangeset for help on using the changeset viewer.