Changeset 148d3c in git


Ignore:
Timestamp:
May 19, 2011, 5:39:53 AM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')
Children:
c8204aefe85bd27523a76a77f4ae555c156bdc21
Parents:
3199ac3605af0f6ec91729ae32d5704af6105991
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-19 05:39:53+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:08+01:00
Message:
FIX: fixing the build system (install needed headers on needed places)
FIX: libpolys-config is correct now (installed, echo -n-fixed)
ADD: trying to use FACTORY_{libs, cflags} as for gmp/ntl
CHG: switched from omalloc_debug to omalloc_g
ADD: symlink for gftables in libpolys/tests
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    r3199ac r148d3c  
    44
    55lib_LIBRARIES = libfactory.a libfactory_g.a
     6
     7libfactory_a_includedir=$(includedir)/factory
     8libfactory_g_a_includedir=$(includedir)/factory
     9
     10libfactory_a_libdir=$(libdir)/factory
     11libfactory_g_a_libdir=$(libdir)/factory
    612
    713libfactory_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${CXXTEMPLFLAGS}
    … …  
    215221
    216222
    217 gftables:       gengftables
     223gftables: gengftables
    218224                @if test -x ${srcdir}/gftables; then \
    219225                        if test ! -x ${builddir}/gftables; then \
    … …  
    231237
    232238BUILT_SOURCES = factory.h factoryconf.h
     239
     240libfactory_a_include_HEADERS=$(BUILT_SOURCES)
     241libfactory_g_a_include_HEADERS=$(BUILT_SOURCES)
    233242
    234243# These files listed below are not used anywhere but are included in
    … …  
    289298
    290299CLEANFILES = factory.h factoryconf.h
     300
     301
     302

  • libpolys/Makefile.am

    r3199ac r148d3c  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
     3bin_SCRIPTS = libpolys-config
     4
     5libpoly_libincludedir = $(libdir)/libpolys/include
     6nodist_libpoly_libinclude_HEADERS = config.h
     7
     8
    39PACKAGES=misc reporter resources coeffs polys tests
    4 
    510SUBDIRS=$(PACKAGES)
    611
    712TESTDIRS=coeffs tests
     13

  • libpolys/coeffs/Makefile.am

    r3199ac r148d3c  
    1313
    1414
    15 include_HEADERS = coeffs.h numbers.h
    16 
    1715noinst_HEADERS= \
    1816        gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h \
    … …  
    2018        mpr_complex.h mpr_global.h
    2119
    22 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
     20INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
    2321
    2422SOURCES = \
    … …  
    2927libcoeffs_g_a_SOURCES = $(SOURCES)
    3028
     29
     30## include_HEADERS = coeffs.h numbers.h
     31
    3132libcoeffs_a_includedir  =$(includedir)/libpolys/coeffs
    3233libcoeffs_g_a_includedir=$(includedir)/libpolys/coeffs
    3334
    34 COEFFSHEADERS  = coeffs.h numbers.h
     35COEFFSHEADERS  = coeffs.h numbers.h si_gmp.h
    3536libcoeffs_a_include_HEADERS   = $(COEFFSHEADERS)
    3637libcoeffs_g_a_include_HEADERS = $(COEFFSHEADERS)
    … …  
    4647test_g_SOURCES = test.cc
    4748
    48 test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc -lfactory -lomalloc
    49 test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
     49test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc
     50test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} ${FACTORY_LIBS} -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g
    5051
    5152

  • libpolys/libpolys-config.in

    • Property mode changed from 100644 to 100755
    r3199ac r148d3c  
    1 #! /bin/sh
     1#! /bin/bash
    22
    33prefix=@prefix@
    … …  
    55includedir=@includedir@
    66libdir=@libdir@
     7
     8ECHO="echo"
     9ECHOn="printf"
    710
    811usage()
    … …  
    3336while test $# -gt 0; do
    3437    case "$1" in
    35     -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
     38    -*=*) optarg=`${ECHO} "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    3639    *) optarg= ;;
    3740    esac
    … …  
    4346
    4447    --prefix)
    45         echo $prefix
     48        ${ECHO} $prefix
    4649        ;;
    4750
    4851    --version)
    49         echo @VERSION@
     52        ${ECHO} @VERSION@
    5053        exit 0
    5154        ;;
    … …  
    5659
    5760    --cflags)
    58         echo -n " -I${includedir} @GMP_CFLAGS@"
     61        ${ECHOn} " -I${includedir} -I${includedir}/libpolys @GMP_CFLAGS@ @NTL_CFLAGS@ @FACTORY_CFLAGS@"
    5962        ;;
    6063
    6164    --libs)
    62         echo -n " -L${libdir} -lpolys @GMP_LIBS@"
     65        ${ECHOn} " -L${libdir} -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lomalloc_g @USEPPROCSDYNAMICLD@ @GMP_LIBS@ @NTL_LIBS@ @FACTORY_LIBS@"
    6366        ;;
    6467
    … …  
    7073    shift
    7174done
    72 echo
     75${ECHO}
    7376
    7477exit 0

  • libpolys/misc/Makefile.am

    r3199ac r148d3c  
    2222libmisc_g_a_includedir=$(includedir)/libpolys/misc
    2323
     24###????
     25#libmisc_a_libdir  =${libdir}/libpolys
     26#libmisc_g_a_libdir=${libdir}/libpolys
     27
    2428MISCHEADERS  = auxiliary.h mylimits.h options.h intvec.h
    2529libmisc_a_include_HEADERS   = $(MISCHEADERS)

  • libpolys/polys/Makefile.am

    r3199ac r148d3c  
    3030endif
    3131
     32lib_LIBRARIES=libpolys.a libpolys_g.a
     33
     34libpolys_a_includedir=$(includedir)/libpolys/polys
     35libpolys_g_a_includedir=$(includedir)/libpolys/polys
     36
    3237SOURCES = \
    3338        monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
    … …  
    4449noinst_HEADERS =
    4550
    46 include_HEADERS = \
    47         monomials/ring.h nc/nc.h \
    48   nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
     51LIBPOLYSHEADERS = monomials/ring.h monomials/monomials.h \
     52        nc/nc.h nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
    4953        pInline0.h operations/pShallowCopyDelete.h \
    5054        templates/p_MemAdd.h templates/p_MemCmp.h templates/p_MemCopy.h operations/p_Mult_q.h \
    … …  
    5458        kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
    5559        ext_fields/algext.h clapsing.h clapconv.h
     60
     61### nobase_include_HEADERS = $(LIBPOLYSHEADERS)
     62
     63
    5664
    5765P_PROCS_CPPFLAGS_COMMON = -DHAVE_CONFIG_H -DDYNAMIC_VERSION
    … …  
    103111
    104112
    105 
    106 lib_LIBRARIES=libpolys.a libpolys_g.a
    107 
    108 moduledir = ${libdir}/singular/MOD/
     113moduledir = $(libdir)/libpolys/MOD/
    109114
    110115if ENABLE_P_PROCS_DYNAMIC
    … …  
    113118endif
    114119
     120
     121nobase_libpolys_a_include_HEADERS = $(LIBPOLYSHEADERS)
     122nobase_libpolys_g_a_include_HEADERS = $(LIBPOLYSHEADERS)
     123
     124
    115125libpolys_a_SOURCES = ${SOURCES}
    116126libpolys_g_a_SOURCES = ${SOURCES}
    117127
     128## libpolys_adir = $(libdir)/libpolys
     129## libpolys_g_adir = $(libdir)/libpolys
     130
    118131EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
    119 
    120 libpolys_a_includedir  =$(includedir)/libpolys/polys
    121 libpolys_g_a_includedir=$(includedir)/libpolys/polys
    122132
    123133EXTRA_PROGRAMS = templates/p_Procs_Generate

  • libpolys/tests/Makefile.am

    r3199ac r148d3c  
    1212AM_CPPFLAGS = -DHAVE_CONFIG_H
    1313
    14 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS}  ${NTL_CFLAGS}
     14INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS} ${FACTORY_CFLAGS}
    1515
    1616
    … …  
    1818check_PROGRAMS = $(TESTS)
    1919
    20 simple_test_SOURCES = simple_test_runner.cpp
    21 coeffs_test_SOURCES = coeffs_test_runner.cpp
    22 polys_test_SOURCES = polys_test_runner.cpp
    23 rings_test_SOURCES = rings_test_runner.cpp
     20simple_test_SOURCES = simple_test_runner.cpp gftables
     21coeffs_test_SOURCES = coeffs_test_runner.cpp gftables
     22polys_test_SOURCES = polys_test_runner.cpp gftables
     23rings_test_SOURCES = rings_test_runner.cpp gftables
    2424
    2525
    … …  
    2727rings_test_LDFLAGS = $(polys_test_LDFLAGS)
    2828
    29 coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
     29coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g
    3030polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD)
    3131rings_test_LDADD = $(polys_test_LDADD)
    3232
    33 noinst_SCRIPTS =        p_Procs_FieldGeneral.so \
    34                         p_Procs_FieldIndep.so \
    35                         p_Procs_FieldQ.so \
    36                         p_Procs_FieldZp.so
     33noinst_SCRIPTS = p_Procs_FieldGeneral.so \
     34                 p_Procs_FieldIndep.so \
     35                 p_Procs_FieldQ.so \
     36                 p_Procs_FieldZp.so
     37
     38gftables: ${top_srcdir}/../factory/gftables
     39        ln -snf ${top_srcdir}/../factory/gftables ${builddir}
    3740
    3841p_Procs_FieldGeneral.so:        ${top_builddir}/polys/.libs/p_Procs_FieldGeneral.so

  • m4/options.m4

    r3199ac r148d3c  
    3333     ENABLE_FACTORY="no"
    3434 fi
    35 ],[ENABLE_FACTORY="yes"])
     35],[ENABLE_FACTORY="no"])
    3636
    3737if test x$ENABLE_FACTORY = xyes; then
     38  FACTORY_CFLAGS=""
     39  FACTORY_LIBS="-lfactory"
     40
     41  AC_SUBST(FACTORY_CFLAGS)
     42  AC_SUBST(FACTORY_LIBS)
     43 
    3844  AC_DEFINE(HAVE_FACTORY,1,Enable factory)
    3945fi
     46
     47
    4048
    4149AM_CONDITIONAL([ENABLE_FACTORY],[test x$ENABLE_FACTORY = xyes])

  • omalloc/Makefile.am

    r3199ac r148d3c  
    1 lib_LIBRARIES=libomalloc.a libomalloc_debug.a
     1lib_LIBRARIES=libomalloc.a libomalloc_g.a
    22
    33libomalloc_a_includedir=$(includedir)/omalloc
    … …  
    1111omBinPage.h             omAllocSystem.h         omTables.h              \
    1212omAllocPrivate.h        omDebug.h               omInline.h              \
    13 omAllocFunc.h
     13omAllocFunc.h           omlimits.h              mylimits.h
    1414
    1515
    1616
    17 noinst_HEADERS=\
    18 mylimits.h              omlimits.h              omPage.h                \
    19 omDefaultConfig.h       omReturn.h
     17noinst_HEADERS= omPage.h omDefaultConfig.h omReturn.h
    2018
    2119SOURCES=\
    … …  
    2927
    3028libomalloc_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
    31 libomalloc_debug_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
     29libomalloc_g_a_SOURCES=$(SOURCES) $(noinst_HEADERS)
    3230
    3331nodist_libomalloc_a_SOURCES = omConfig.h omlimits.h mylimits.h omTables.h omalloc.h omTables.inc
    34 nodist_libomalloc_debug_a_SOURCES = omConfig.h omlimits.h omTables.h omalloc.h omTables.inc
     32nodist_libomalloc_g_a_SOURCES = omConfig.h omlimits.h omTables.h omalloc.h omTables.inc
    3533
    3634libomalloc_a_CPPFLAGS= -DOM_NDEBUG

  • omalloc/mylimits.h

    r3199ac r148d3c  
    1616
    1717#ifdef IRIX
    18 #include <omlimits.h>
     18#include <omalloc/omlimits.h>
    1919#else
    2020#include <limits.h>
Note: See TracChangeset for help on using the changeset viewer.