Changeset ec0d9b in git


Ignore:
Timestamp:
Apr 19, 2011, 12:22:57 PM (12 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
8184703ffc306b654a4aec87405c86909a05666c
Parents:
1135a6114f30c022e5d6f8153155b10152820187
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-04-19 12:22:57+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:18+01:00
Message:
merge libpolys/polys/configure.ac into polys/configure.ac
Files:
7 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r1135a61 rec0d9b  
    1010*.la
    1111.libs
     12doc/
     13Singular/Singularg
     14Singular/mpsr_Tok.xx
     15Singular/ndbm.dl_og
     16Singular/sing_dbm.dl_og
     17Singular/svnver
     18dyn_modules/modgen/modgen
     19dyn_modules/modgen/pathnames.h
     20emacs/cmd-cmpl.el
     21emacs/lib-cmpl.el
     22emacs/lib-temp
    1223configure
    1324config.h.in*

  • for_Hans_with_love.sh

    r1135a61 rec0d9b  
    11#!/bin/sh
    2 
    3 echo "==============="
    4 echo "run libtoolize in libpolys/polys/"
    5 echo "---------------"
    6 ( cd libpolys/polys/; libtoolize; )
    72
    83autotools (){
    … …  
    2621done
    2722
    28 for d in libpolys; do
    29   echo "==============="
    30   echo "run aclocal -I $TOP_DIR/m4, autotools in $d"
    31   echo "---------------"
    32   cd $d;
    33   aclocal -I $TOP_DIR/m4
    34   autotools
    35   cd $TOP_DIR
    36   echo
    37 done
    38 
    3923for d in omalloc; do
    4024  echo "==============="
    … …  
    4832done
    4933
    50 for d in libpolys/polys; do
     34for d in libpolys; do
    5135  echo "==============="
    52   echo "run aclocal -I $TOP_DIR/m4 -I m4, autotools in $d"
     36  echo "run libtoolize --force, aclocal -I $TOP_DIR/m4, autotools in $d"
    5337  echo "---------------"
    5438  cd $d;
     39  libtoolize --force
    5540  aclocal -I $TOP_DIR/m4 -I m4
    5641  autotools

  • libpolys/Makefile.am

    r1135a61 rec0d9b  
    55SUBDIRS=$(PACKAGES)
    66
    7 TESTDIRS=coeffs
     7TESTDIRS=coeffs tests

  • libpolys/configure.ac

    r1135a61 rec0d9b  
    11AC_INIT([singular], [3.1.2.sw])
    22AM_INIT_AUTOMAKE
    3 AC_CONFIG_MACRO_DIR([../m4])
     3AC_CONFIG_MACRO_DIR([../m4],[m4])
    44AC_CONFIG_SRCDIR([reporter/reporter.h])
    55AC_CONFIG_HEADER([config.h])
    … …  
    1212AC_PROG_LN_S
    1313AC_PROG_INSTALL
    14 AC_PROG_RANLIB
    1514AM_PROG_CC_C_O
     15AC_LIBTOOL_DLOPEN
     16AC_PROG_LIBTOOL
    1617
    1718# Checks for libraries.
    … …  
    2122AC_FUNC_ERROR_AT_LINE
    2223AC_CHECK_FUNCS([memmove memset pow sqrt strchr])
     24AC_FUNC_VPRINTF
     25AC_FUNC_MALLOC
     26AC_CHECK_FUNC([vsnprintf], [AC_DEFINE([HAVE_VSNPRINTF], [1],
     27                               [Define if vsnprintf exists.])])
    2328
    2429# Checks for header files.
    … …  
    3439SING_CHECK_PIPE
    3540
    36 # Checks for library functions.
    37 AC_FUNC_VPRINTF
    38 AC_CHECK_FUNC([vsnprintf], [AC_DEFINE([HAVE_VSNPRINTF], [1],
    39                                [Define if vsnprintf exists.])])
    4041# check for cpu properties
    4142AC_CHECK_SIZEOF(long,4)
    … …  
    4950esac
    5051
     52SING_CHECK_P_PROCS
     53
    5154AC_SUBST(LIBPREFIX)
    5255
    … …  
    5659AC_CONFIG_FILES([resources/Makefile])
    5760AC_CONFIG_FILES([coeffs/Makefile])
     61AC_CONFIG_FILES([polys/Makefile])
    5862AC_CONFIG_FILES([tests/Makefile])
    59 AC_CONFIG_SUBDIRS([polys])
    6063AC_OUTPUT

  • libpolys/polys/Makefile.am

    r1135a61 rec0d9b  
    1 ACLOCAL_AMFLAGS = -I m4 -I ../../m4
    21CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    32
    … …  
    1413AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1514
    16 INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
    17 AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc -L${builddir}
     15INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} -I${includedir} ${GMP_CFLAGS}
     16AM_LDFLAGS      = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/../omalloc -L${builddir}
    1817
    1918if ENABLE_P_PROCS_STATIC
    … …  
    102101EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
    103102
    104 libpolys_a_LIBADD = $(DL_KERNEL_OBJECT)
    105 libpolys_a_DEPENDENCIES = $(DL_KERNEL_OBJECT)
    106 
    107 libpolys_g_a_LIBADD = $(DL_KERNEL_OBJECT_DEBUG)
    108 libpolys_g_a_DEPENDENCIES = $(DL_KERNEL_OBJECT_DEBUG)
    109 
    110 
    111103libpolys_a_includedir  =$(includedir)/libpolys/polys
    112104libpolys_g_a_includedir=$(includedir)/libpolys/polys
Note: See TracChangeset for help on using the changeset viewer.