From e9aeaa240431761360cf90ea8af328b9f7f0bfa0 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Thu, 4 May 2000 14:27:14 +0000 Subject: [PATCH] * Removed internal gmp/ directory and other traces of it like $GMP_INCLUDES. --- FILES | 2 - benchmarks/Makefile.in | 2 +- configure | 208 ++++++++++++--------------- configure.in | 41 +++--- src/Makefile.in | 5 +- src/base/digitseq/Makeflags | 2 +- src/base/digitseq/cl_DS.h | 22 +++ src/complex/algebraic/Makeflags | 2 +- src/complex/elem/division/Makeflags | 2 +- src/complex/input/Makeflags | 2 +- src/complex/misc/Makeflags | 2 +- src/complex/transcendental/Makeflags | 2 +- src/float/Makeflags | 2 +- src/float/dfloat/algebraic/Makeflags | 2 +- src/float/dfloat/conv/Makeflags | 2 +- src/float/dfloat/elem/Makeflags | 2 +- src/float/dfloat/misc/Makeflags | 2 +- src/float/ffloat/conv/Makeflags | 2 +- src/float/ffloat/elem/Makeflags | 2 +- src/float/ffloat/misc/Makeflags | 2 +- src/float/lfloat/Makeflags | 2 +- src/float/sfloat/elem/Makeflags | 2 +- src/float/sfloat/misc/Makeflags | 2 +- src/integer/Makeflags | 2 +- src/modinteger/Makeflags | 2 +- src/numtheory/Makeflags | 2 +- src/polynomial/elem/Makeflags | 2 +- src/rational/Makeflags | 2 +- src/real/Makeflags | 2 +- src/vector/Makeflags | 2 +- tests/Makefile.in | 2 +- 31 files changed, 159 insertions(+), 171 deletions(-) diff --git a/FILES b/FILES index 2b7a438..b48166c 100644 --- a/FILES +++ b/FILES @@ -9,8 +9,6 @@ Files in this package: Source files: src/ - gmp slimmed down version of GNU gmp-2.0.2 - (optional) base base routines of all of CLN (mandatory) integer integer numbers diff --git a/benchmarks/Makefile.in b/benchmarks/Makefile.in index 5b42dc9..ecac462 100644 --- a/benchmarks/Makefile.in +++ b/benchmarks/Makefile.in @@ -15,7 +15,7 @@ CPP = @CPP@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/src @GMP_INCLUDES@ -I$(srcdir) +INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) CPPFLAGS += $(INCLUDES) LIBTOOL = @LIBTOOL@ LIBTOOL_LINK = $(LIBTOOL) --mode=link diff --git a/configure b/configure index 6501c8e..4824dcf 100755 --- a/configure +++ b/configure @@ -22,7 +22,7 @@ ac_help="$ac_help ac_help="$ac_help --with-gnu-ld assume the C compiler uses GNU ld [default=no]" ac_help="$ac_help - --with-gmp use fast GNU gmp low-level functions" + --with-gmp use external fast GNU gmp low-level functions" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -2731,29 +2731,101 @@ if test "${with_gmp+set}" = set; then : fi -if test -z "$with_gmp"; then - if test -d "${srcdir}/gmp"; then - with_gmp=yes - else - with_gmp=no - fi -fi if test "$with_gmp" = yes; then - cat >> confdefs.h <<\EOF -#define CL_USE_GMP 1 + ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 +echo "configure:2738: checking for gmp.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +with_gmp="no" +fi + + echo $ac_n "checking for __gmpn_divexact_by3 in -lgmp""... $ac_c" 1>&6 +echo "configure:2771: checking for __gmpn_divexact_by3 in -lgmp" >&5 +ac_lib_var=`echo gmp___gmpn_divexact_by3 | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lgmp $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else - GMP_INCLUDES='' - GMP_OBJDEPS='' - GMP_OBJS='' + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo gmp | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +with_gmp="no" +fi +fi +if test "$with_gmp" = yes; then + cat >> confdefs.h <<\EOF +#define CL_USE_GMP 1 +EOF + +else + echo "configure: warning: disabling external gmp" 1>&2 +fi for f in 'tests/.gdbinit'; do if test '!' -f "$f"; then echo "creating $f" @@ -2913,9 +2985,6 @@ s%@NM@%$NM%g s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g s%@ALLOCA@%$ALLOCA%g -s%@GMP_INCLUDES@%$GMP_INCLUDES%g -s%@GMP_OBJDEPS@%$GMP_OBJDEPS%g -s%@GMP_OBJS@%$GMP_OBJS%g CEOF EOF @@ -3130,104 +3199,3 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -if test "$with_gmp" = yes; then - -if test "$no_recursion" != yes; then - - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $ac_configure_args; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case "$ac_arg" in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done - - for ac_config_dir in gmp; do - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - if test ! -d $srcdir/$ac_config_dir; then - continue - fi - - echo configuring in $ac_config_dir - - case "$srcdir" in - .) ;; - *) - if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; - else - { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } - fi - ;; - esac - - ac_popdir=`pwd` - cd $ac_config_dir - - # A "../" for each directory in /$ac_config_dir. - ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` - - case "$srcdir" in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_config_dir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure; then - ac_sub_configure=$ac_sub_srcdir/configure - elif test -f $ac_sub_srcdir/configure.in; then - ac_sub_configure=$ac_configure - else - echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - - # Make the cache file name correct relative to the subdirectory. - case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; - *) # Relative path. - if test -n "$ac_dots"; then - ac_sub_cache_file="$ac_dots"`echo "$cache_file" | sed 's,^\./,,'` - else - ac_sub_cache_file="$cache_file" - fi - ;; - esac - - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. - if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir - then : - else - { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } - fi - fi - - cd $ac_popdir - done -fi - -fi diff --git a/configure.in b/configure.in index 672c920..5d4cd6b 100644 --- a/configure.in +++ b/configure.in @@ -67,6 +67,20 @@ dnl PACKAGE=cln AM_DISABLE_SHARED AM_PROG_LIBTOOL +dnl CLN library version information. +dnl +dnl Making new releases: +dnl CLN_MICRO_VERSION += 1; +dnl CLN_INTERFACE_AGE += 1; +dnl CLN_BINARY_AGE += 1; +dnl if any functions have been added, set CLN_INTERFACE_AGE to 0. +dnl if backwards compatibility has been broken, +dnl set CLN_BINARY_AGE and CLN_INTERFACE_AGE to 0. +dnl CLN_MAJOR_VERSION=1 +dnl CLN_MINOR_VERSION=0 +dnl CLN_MICRO_VERSION=4 +dnl CLN_INTERFACE_AGE=1 +dnl CLN_BINARY_AGE=1 dnl sets variable LIBTOOL dnl dnl checks for compiler characteristics @@ -119,29 +133,19 @@ CL_MACHINE([integer types and behaviour],${srcdir}/autoconf/intparam.c,include/c CL_MACHINE([floating-point types and behaviour],${srcdir}/autoconf/floatparam.c,include/cl_floatparam.h,cl_cv_file_floatparam_h) dnl builds include/cl_floatparam.h dnl -dnl interfacing to GNU gmp +dnl interfacing to GNU gmp (must be at least version 3) dnl -AC_ARG_WITH(gmp, [ --with-gmp use fast GNU gmp low-level functions]) -if test -z "$with_gmp"; then - if test -d "${srcdir}/gmp"; then - with_gmp=yes - else - with_gmp=no - fi +AC_ARG_WITH(gmp, [ --with-gmp use external fast GNU gmp low-level functions]) +if test "$with_gmp" = yes; then + AC_CHECK_HEADER(gmp.h, , with_gmp="no") +dnl mpn_divexact_by3 was introduced in gmp3 and the symbol has a leading `__g': + AC_CHECK_LIB(gmp, __gmpn_divexact_by3, , with_gmp="no") fi if test "$with_gmp" = yes; then AC_DEFINE(CL_USE_GMP) - GMP_INCLUDES='-I$(top_srcdir)/gmp' - GMP_OBJDEPS='../gmp/mpn/libmpn.la' - GMP_OBJS='../gmp/mpn/*.lo ../gmp/*.lo' else - GMP_INCLUDES='' - GMP_OBJDEPS='' - GMP_OBJS='' + AC_MSG_WARN([disabling external gmp]) fi -AC_SUBST(GMP_INCLUDES) -AC_SUBST(GMP_OBJDEPS) -AC_SUBST(GMP_OBJS) dnl dnl That's it. dnl @@ -156,6 +160,3 @@ changequote([,])dnl fi done AC_OUTPUT(Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile) -if test "$with_gmp" = yes; then - AC_OUTPUT_SUBDIRS(gmp) -fi diff --git a/src/Makefile.in b/src/Makefile.in index 9079d66..2257a7c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -25,7 +25,6 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ INCLUDES = -I../include -I$(top_srcdir)/include -GMP_INCLUDES = @GMP_INCLUDES@ CPPFLAGS += $(INCLUDES) LIBTOOL = @LIBTOOL@ LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile @@ -195,8 +194,8 @@ ifeq ($(SUBDIR),.) cd ../gmp && $(MAKE) mpn/libmpn.la mp_clz_tab.lo -libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO) @GMP_OBJDEPS@ - $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) $(ALLOBJECTS_LO) @GMP_OBJS@ +libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO) + $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) $(ALLOBJECTS_LO) install : all force if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi diff --git a/src/base/digitseq/Makeflags b/src/base/digitseq/Makeflags index 2e55239..bd82ef7 100644 --- a/src/base/digitseq/Makeflags +++ b/src/base/digitseq/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/base/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/digit -I$(srcdir)/base/random -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/base/digit -I$(srcdir)/base/random -Ibase diff --git a/src/base/digitseq/cl_DS.h b/src/base/digitseq/cl_DS.h index 7f5e9d1..0b651f7 100644 --- a/src/base/digitseq/cl_DS.h +++ b/src/base/digitseq/cl_DS.h @@ -516,6 +516,28 @@ inline uintD mulusub_loop_up (uintD digit, const uintD* sourceptr, uintD* destpt #define MUL_LOOPS +inline uintD divu_loop_up (uintD digit, uintD* ptr, uintC len) +{ + return mpn_divrem_1(ptr,0,ptr,len,digit); +} + +inline uintD divu_loop_down (uintD digit, uintD* ptr, uintC len) +{ + return mpn_divrem_1(ptr-len,0,ptr-len,len,digit); +} + +inline uintD divucopy_loop_up (uintD digit, const uintD* sourceptr, uintD* destptr, uintC len) +{ + return mpn_divrem_1(destptr,0,sourceptr,len,digit); +} + +inline uintD divucopy_loop_down (uintD digit, const uintD* sourceptr, uintD* destptr, uintC len) +{ + return mpn_divrem_1(destptr-len,0,sourceptr-len,len,digit); +} + +#define DIV_LOOPS + #endif // defined(CL_USE_GMP) diff --git a/src/complex/algebraic/Makeflags b/src/complex/algebraic/Makeflags index efc1040..e7754d7 100644 --- a/src/complex/algebraic/Makeflags +++ b/src/complex/algebraic/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat/elem -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/real -I$(srcdir)/float/sfloat/elem -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat/elem -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat/elem -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat/elem -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/elem/division/Makeflags b/src/complex/elem/division/Makeflags index 4b1e364..d9e31e6 100644 --- a/src/complex/elem/division/Makeflags +++ b/src/complex/elem/division/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/real -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/input/Makeflags b/src/complex/input/Makeflags index 699fadf..652253f 100644 --- a/src/complex/input/Makeflags +++ b/src/complex/input/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float -I$(srcdir)/integer -I$(srcdir)/base/string -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/float -I$(srcdir)/integer -I$(srcdir)/base/string -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/misc/Makeflags b/src/complex/misc/Makeflags index d1e7c47..52a9d32 100644 --- a/src/complex/misc/Makeflags +++ b/src/complex/misc/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/complex/transcendental/Makeflags b/src/complex/transcendental/Makeflags index a8e32dc..cd21a8c 100644 --- a/src/complex/transcendental/Makeflags +++ b/src/complex/transcendental/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/complex/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/real/conv -I$(srcdir)/real -I$(srcdir)/float/transcendental -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/real/conv -I$(srcdir)/real -I$(srcdir)/float/transcendental -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/Makeflags b/src/float/Makeflags index 6f69c43..2b2c3e0 100644 --- a/src/float/Makeflags +++ b/src/float/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/float/dfloat/algebraic/Makeflags b/src/float/dfloat/algebraic/Makeflags index 031a738..a04b8bd 100644 --- a/src/float/dfloat/algebraic/Makeflags +++ b/src/float/dfloat/algebraic/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/conv/Makeflags b/src/float/dfloat/conv/Makeflags index f4f386c..d52a363 100644 --- a/src/float/dfloat/conv/Makeflags +++ b/src/float/dfloat/conv/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/elem/Makeflags b/src/float/dfloat/elem/Makeflags index fa74aac..171ae81 100644 --- a/src/float/dfloat/elem/Makeflags +++ b/src/float/dfloat/elem/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/base -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/float/base -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/dfloat/misc/Makeflags b/src/float/dfloat/misc/Makeflags index f8842d2..aa6cd70 100644 --- a/src/float/dfloat/misc/Makeflags +++ b/src/float/dfloat/misc/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/dfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/dfloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/float/dfloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/ffloat/conv/Makeflags b/src/float/ffloat/conv/Makeflags index 45ecb2f..6d33d59 100644 --- a/src/float/ffloat/conv/Makeflags +++ b/src/float/ffloat/conv/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/ffloat/elem/Makeflags b/src/float/ffloat/elem/Makeflags index e499941..15fe2a0 100644 --- a/src/float/ffloat/elem/Makeflags +++ b/src/float/ffloat/elem/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/base -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/float/base -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/ffloat/misc/Makeflags b/src/float/ffloat/misc/Makeflags index 4934bd6..4d80207 100644 --- a/src/float/ffloat/misc/Makeflags +++ b/src/float/ffloat/misc/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/ffloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/ffloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/float/ffloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/lfloat/Makeflags b/src/float/lfloat/Makeflags index eced2ef..39a5ca3 100644 --- a/src/float/lfloat/Makeflags +++ b/src/float/lfloat/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/float/sfloat/elem/Makeflags b/src/float/sfloat/elem/Makeflags index 830c0f8..ddfbd55 100644 --- a/src/float/sfloat/elem/Makeflags +++ b/src/float/sfloat/elem/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/float/sfloat/misc/Makeflags b/src/float/sfloat/misc/Makeflags index 9799575..b08ce04 100644 --- a/src/float/sfloat/misc/Makeflags +++ b/src/float/sfloat/misc/Makeflags @@ -1,4 +1,4 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/float/sfloat/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/float/sfloat/elem -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/integer/Makeflags b/src/integer/Makeflags index 04eee3b..2375994 100644 --- a/src/integer/Makeflags +++ b/src/integer/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/modinteger/Makeflags b/src/modinteger/Makeflags index 99cd642..d253236 100644 --- a/src/modinteger/Makeflags +++ b/src/modinteger/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/integer/hash -I$(srcdir)/integer -I$(srcdir)/base/hash -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/integer/hash -I$(srcdir)/integer -I$(srcdir)/base/hash -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/numtheory/Makeflags b/src/numtheory/Makeflags index 04eee3b..2375994 100644 --- a/src/numtheory/Makeflags +++ b/src/numtheory/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/polynomial/elem/Makeflags b/src/polynomial/elem/Makeflags index 38911b4..239277b 100644 --- a/src/polynomial/elem/Makeflags +++ b/src/polynomial/elem/Makeflags @@ -1,5 +1,5 @@ # This file contains additional flags for the main Makefile. include $(srcdir)/polynomial/Makeflags -SUBDIR_INCLUDES += -I$(srcdir)/base/hash -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase $(GMP_INCLUDES) +SUBDIR_INCLUDES += -I$(srcdir)/base/hash -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase diff --git a/src/rational/Makeflags b/src/rational/Makeflags index 701b7f8..4ce48e5 100644 --- a/src/rational/Makeflags +++ b/src/rational/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/real/Makeflags b/src/real/Makeflags index 7658c93..5d5fe4d 100644 --- a/src/real/Makeflags +++ b/src/real/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/real -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/real -I$(srcdir)/float/sfloat -I$(srcdir)/float/ffloat -I$(srcdir)/float/dfloat -I$(srcdir)/float/lfloat -I$(srcdir)/float -I$(srcdir)/rational -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/src/vector/Makeflags b/src/vector/Makeflags index 1557a11..8efa95a 100644 --- a/src/vector/Makeflags +++ b/src/vector/Makeflags @@ -1,3 +1,3 @@ # This file contains additional flags for the main Makefile. -SUBDIR_INCLUDES = -I$(srcdir)/vector -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base $(GMP_INCLUDES) +SUBDIR_INCLUDES = -I$(srcdir)/vector -I$(srcdir)/integer -I$(srcdir)/base/digitseq -I$(srcdir)/base/digit -Ibase -I$(srcdir)/base diff --git a/tests/Makefile.in b/tests/Makefile.in index 2c3b8e5..4146f8e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -15,7 +15,7 @@ CPP = @CPP@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/base -I$(top_srcdir)/src/float -I$(top_srcdir)/src/float/lfloat -I$(top_srcdir)/src/integer -I$(top_srcdir)/src/base/random -I$(top_srcdir)/src/base/digitseq -I$(top_srcdir)/src/base/digit -I../src/base -I$(top_srcdir)/src/base @GMP_INCLUDES@ +INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/base -I$(top_srcdir)/src/float -I$(top_srcdir)/src/float/lfloat -I$(top_srcdir)/src/integer -I$(top_srcdir)/src/base/random -I$(top_srcdir)/src/base/digitseq -I$(top_srcdir)/src/base/digit -I../src/base -I$(top_srcdir)/src/base CPPFLAGS += $(INCLUDES) LIBTOOL = @LIBTOOL@ LIBTOOL_LINK = $(LIBTOOL) --mode=link