Changeset a3a6a0 in git


Ignore:
Timestamp:
Sep 1, 2016, 10:48:08 AM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
d4e6a9eab50cd94d6a7a4660b9b587bfe8242de6
Parents:
f7a7431c2c9f7edfccca81fac262c41c14c61d09
Message:
change library name: libresources -> libsingular_resources
Files:
11 edited
1 moved

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    rf7a7431 ra3a6a0  
    177177ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
    178178${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
    179 ${top_builddir}/resources/libresources.la
     179${top_builddir}/resources/libsingular_resources.la
    180180
    181181
     
    187187TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
    188188${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
    189 ${top_builddir}/resources/libresources.la
     189${top_builddir}/resources/libsingular_resources.la
    190190
    191191TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
  • autogen.sh

    rf7a7431 ra3a6a0  
    55# -d --warnings=all
    66autoreconf  -v -f -i
     7find . -name configure -exec sed -i "s/-g -O2/-g/g" {} \; -print
    78
    89cd -
  • factory/configure.ac

    rf7a7431 ra3a6a0  
    121121    [test "x$enable_streamio" = xyes])
    122122
    123 AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
    124 AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
    125 
    126 AC_MSG_CHECKING(whether libresources should be used)
     123AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
     124AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
     125
     126AC_MSG_CHECKING(whether libsingular_resources should be used)
    127127if test "x$with_Singular" = xyes;
    128128then
     
    135135  AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
    136136
    137   PKG_REQUIRE="$PKG_REQUIRE resources"
     137  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
    138138  AC_SUBST(PKG_REQUIRE)
    139139else
  • gfanlib/configure.ac

    rf7a7431 ra3a6a0  
    33
    44AC_PREREQ([2.63])
    5 AC_INIT([libgfan], [0.1], [ren@mathematik.uni-kl.de])
     5AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.de])
    66AC_CONFIG_MACRO_DIR([../m4])
    77AC_CONFIG_AUX_DIR([../build-aux])
  • libpolys/configure.ac

    rf7a7431 ra3a6a0  
    9191ENABLE_RESOURCES="yes"
    9292
    93 AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
    94 AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
     93AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
     94AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
    9595
    96 AC_MSG_CHECKING(whether libresources should be used)
     96AC_MSG_CHECKING(whether libsingular_resources should be used)
    9797
    9898if test "x$ENABLE_RESOURCES" = xyes;
     
    106106  AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
    107107
    108   PKG_REQUIRE="$PKG_REQUIRE resources"
     108  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
    109109  AC_SUBST(PKG_REQUIRE)
    110110else
  • m4/options.m4

    rf7a7431 ra3a6a0  
    151151AC_DEFUN([SING_USE_RESOURCES],
    152152[
    153  AC_ARG_ENABLE(resources,
    154   [AS_HELP_STRING([--disable-resources], [do NOT use libresources within the factory])],
     153 AC_ARG_ENABLE(singular_resources,
     154  [AS_HELP_STRING([--disable-singular_resources], [do NOT use libsingular_resources within the factory])],
    155155  [if test "x$enableval"  = "xyes"; then
    156156    ENABLE_RESOURCES=yes
     
    158158    ENABLE_RESOURCES=yes)
    159159
    160  AC_MSG_CHECKING(whether to use libresources in factory and co.)
     160 AC_MSG_CHECKING(whether to use libsingular_resources in factory and co.)
    161161 if test "x$ENABLE_RESOURCES" = xyes; then
    162162  AC_MSG_RESULT(yes)
    163163  RESOURCES_INCLUDES="-I$ac_abs_top_srcdir "
    164164
    165   RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la"
     165  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la"
    166166
    167167  AC_SUBST(RESOURCES_INCLUDES)
     
    172172  ac_configure_args="$ac_configure_args $ENABLE_ARG"
    173173
    174   PKG_REQUIRE="$PKG_REQUIRE resources"
     174  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
    175175  AC_SUBST(PKG_REQUIRE)
    176176 else
  • resources/Makefile.am

    rf7a7431 ra3a6a0  
    11ACLOCAL_AMFLAGS = -I ../m4
    22
    3 libresources_LTLIBRARIES = libresources.la
     3libsingular_resources_LTLIBRARIES = libsingular_resources.la
    44
    5 libresourcesdir = $(libdir)
     5libsingular_resourcesdir = $(libdir)
    66
    77
     
    1010
    1111SOURCES  = omFindExec.c feResource.cc feFopen.cc
    12 libresources_la_SOURCES   = $(SOURCES)
     12libsingular_resources_la_SOURCES   = $(SOURCES)
    1313
    14 libresources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
     14libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
    1515
    16 libresources_includedir  =$(includedir)/resources
     16libsingular_resources_includedir  =$(includedir)/resources
    1717
    18 libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
     18libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
    1919
    20 nodist_libresources_include_HEADERS = resourcesconfig.h
    21 DISTCLEANFILES = $(nodist_libresources_include_HEADERS)
     20nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h
     21DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
    2222
    2323pkgconfigdir = $(libdir)/pkgconfig
    24 pkgconfig_DATA = resources.pc
     24pkgconfig_DATA = singular_resources.pc
  • resources/configure.ac

    rf7a7431 ra3a6a0  
    1 AC_INIT([resources], [4.0.3])
     1AC_INIT([singular_resources], [4.0.3])
    22
    33AC_CONFIG_MACRO_DIR([../m4])
     
    1515
    1616# Add pre'prefixed config
    17 AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h])
     17AX_PREFIX_CONFIG_H([singular_resourcesconfig.h],[],[_config.h])
    1818
    1919SING_RESET_FLAGS()
     
    7171AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
    7272
    73 AC_CONFIG_FILES([resources.pc Makefile])
     73AC_CONFIG_FILES([singular_resources.pc Makefile])
    7474AC_OUTPUT
  • resources/feFopen.cc

    rf7a7431 ra3a6a0  
    1 #include "resourcesconfig.h"
     1#include "singular_resourcesconfig.h"
    22#include "feResource.h"
    33#include "feFopen.h"
  • resources/feResource.cc

    rf7a7431 ra3a6a0  
    66*/
    77
    8 #include "resourcesconfig.h"
     8#include "singular_resourcesconfig.h"
    99#include "feResource.h"
    1010#include "omFindExec.h"
  • resources/omFindExec.c

    rf7a7431 ra3a6a0  
    77
    88
    9 #include "resourcesconfig.h"
     9#include "singular_resourcesconfig.h"
    1010
    1111
Note: See TracChangeset for help on using the changeset viewer.