summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am16
-rw-r--r--configure.in2
-rw-r--r--rand/Makefile.am27
-rw-r--r--rand/rand.c (renamed from rand.c)0
-rw-r--r--rand/randbui.c (renamed from randbui.c)0
-rw-r--r--rand/randclr.c (renamed from randclr.c)0
-rw-r--r--rand/randdef.c (renamed from randdef.c)0
-rw-r--r--rand/randiset.c (renamed from randiset.c)0
-rw-r--r--rand/randlc2s.c (renamed from randlc2s.c)0
-rw-r--r--rand/randlc2x.c (renamed from randlc2x.c)0
-rw-r--r--rand/randmt.c (renamed from randmt.c)0
-rw-r--r--rand/randmt.h (renamed from randmt.h)0
-rw-r--r--rand/randmts.c (renamed from randmts.c)0
-rw-r--r--rand/randmui.c (renamed from randmui.c)0
-rw-r--r--rand/rands.c (renamed from rands.c)0
-rw-r--r--rand/randsd.c (renamed from randsd.c)0
-rw-r--r--rand/randsdui.c (renamed from randsdui.c)0
18 files changed, 46 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ae078703..e25612be8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-11-11 Torbjorn Granlund <tege@gmplib.org>
+ * rand: New directory, move rand*.c and randmt.h here.
+ * rand/Makefile.am: New file.
+ * Makefile.am (SUBDIRS): Add rand.
+ (RANDOM_OBJECTS): New variable.
+ (libgmp_la_SOURCES): Remove random objects.
+ (libgmp_la_DEPENDENCIES): Add RANDOM_OBJECTS.
+ * configure.in (AC_OUTPUT): Add rand/Makefile.
+
* ansi2knr.1: File removed.
* ansi2knr.c: File removed.
diff --git a/Makefile.am b/Makefile.am
index cddd87997..e70e98812 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,7 +92,7 @@ LIBMP_LT_REVISION = 21
LIBMP_LT_AGE = 1
-SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc
+SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx mpbsd demos tune doc
EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
@@ -221,6 +221,12 @@ SCANF_OBJECTS = \
scanf/scanf$U.lo scanf/sscanf$U.lo scanf/sscanffuns$U.lo \
scanf/vfscanf$U.lo scanf/vscanf$U.lo scanf/vsscanf$U.lo
+RANDOM_OBJECTS = \
+ rand/rand$U.lo rand/randclr$U.lo rand/randdef$U.lo rand/randiset$U.lo \
+ rand/randlc2s$U.lo rand/randlc2x$U.lo rand/randmt$U.lo \
+ rand/randmts$U.lo rand/rands$U.lo rand/randsd$U.lo rand/randsdui$U.lo \
+ rand/randbui$U.lo rand/randmui$U.lo
+
# no $U for C++ files
CXX_OBJECTS = \
cxx/isfuns.lo cxx/ismpf.lo cxx/ismpq.lo cxx/ismpz.lo cxx/ismpznw.lo \
@@ -248,17 +254,15 @@ MPBSD_OBJECTS = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo \
# -export-symbols, since the tune and speed programs, and perhaps some of
# the test programs, want to access undocumented symbols.
-libgmp_la_SOURCES = gmp-impl.h longlong.h randmt.h \
+libgmp_la_SOURCES = gmp-impl.h longlong.h \
assert.c compat.c errno.c extract-dbl.c invalid.c memory.c \
mp_bpl.c mp_clz_tab.c mp_dv_tab.c mp_minv_tab.c mp_get_fns.c mp_set_fns.c \
- rand.c randclr.c randdef.c randiset.c randlc2s.c randlc2x.c randmt.c \
- randmts.c rands.c randsd.c randsdui.c randbui.c randmui.c version.c \
- nextprime.c
+ version.c nextprime.c
EXTRA_libgmp_la_SOURCES = tal-debug.c tal-notreent.c tal-reent.c
libgmp_la_DEPENDENCIES = @TAL_OBJECT@ \
$(MPF_OBJECTS) $(MPZ_OBJECTS) $(MPQ_OBJECTS) \
$(MPN_OBJECTS) @mpn_objs_in_libgmp@ \
- $(PRINTF_OBJECTS) $(SCANF_OBJECTS)
+ $(PRINTF_OBJECTS) $(SCANF_OBJECTS) $(RANDOM_OBJECTS)
libgmp_la_LIBADD = $(libgmp_la_DEPENDENCIES)
libgmp_la_LDFLAGS = $(GMP_LDFLAGS) $(LIBGMP_LDFLAGS) \
-version-info $(LIBGMP_LT_CURRENT):$(LIBGMP_LT_REVISION):$(LIBGMP_LT_AGE)
diff --git a/configure.in b/configure.in
index cb534716e..a1ce848c7 100644
--- a/configure.in
+++ b/configure.in
@@ -3391,7 +3391,7 @@ GMP_FINISH
AC_OUTPUT(Makefile \
mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \
- mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \
+ mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile \
tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \
tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile \
tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile \
diff --git a/rand/Makefile.am b/rand/Makefile.am
new file mode 100644
index 000000000..844bd81e8
--- /dev/null
+++ b/rand/Makefile.am
@@ -0,0 +1,27 @@
+## Process this file with automake to generate Makefile.in
+
+# Copyright 2001, 2002, 2010 Free Software Foundation, Inc.
+#
+# This file is part of the GNU MP Library.
+#
+# The GNU MP Library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+#
+# The GNU MP Library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with the GNU MP Library. If not, see http://www.gnu.org/licenses/.
+
+
+INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+
+noinst_LTLIBRARIES = librandom.la
+
+librandom_la_SOURCES = randmt.h \
+ rand.c randclr.c randdef.c randiset.c randlc2s.c randlc2x.c randmt.c \
+ randmts.c rands.c randsd.c randsdui.c randbui.c randmui.c
diff --git a/rand.c b/rand/rand.c
index 31969b298..31969b298 100644
--- a/rand.c
+++ b/rand/rand.c
diff --git a/randbui.c b/rand/randbui.c
index 5fc49b27d..5fc49b27d 100644
--- a/randbui.c
+++ b/rand/randbui.c
diff --git a/randclr.c b/rand/randclr.c
index a4e82426f..a4e82426f 100644
--- a/randclr.c
+++ b/rand/randclr.c
diff --git a/randdef.c b/rand/randdef.c
index 171a0bd87..171a0bd87 100644
--- a/randdef.c
+++ b/rand/randdef.c
diff --git a/randiset.c b/rand/randiset.c
index f140a330b..f140a330b 100644
--- a/randiset.c
+++ b/rand/randiset.c
diff --git a/randlc2s.c b/rand/randlc2s.c
index 4dcde73a2..4dcde73a2 100644
--- a/randlc2s.c
+++ b/rand/randlc2s.c
diff --git a/randlc2x.c b/rand/randlc2x.c
index b95eff254..b95eff254 100644
--- a/randlc2x.c
+++ b/rand/randlc2x.c
diff --git a/randmt.c b/rand/randmt.c
index ccd4a11e0..ccd4a11e0 100644
--- a/randmt.c
+++ b/rand/randmt.c
diff --git a/randmt.h b/rand/randmt.h
index fc2338105..fc2338105 100644
--- a/randmt.h
+++ b/rand/randmt.h
diff --git a/randmts.c b/rand/randmts.c
index e3b033885..e3b033885 100644
--- a/randmts.c
+++ b/rand/randmts.c
diff --git a/randmui.c b/rand/randmui.c
index f349d3593..f349d3593 100644
--- a/randmui.c
+++ b/rand/randmui.c
diff --git a/rands.c b/rand/rands.c
index 93eb3e70c..93eb3e70c 100644
--- a/rands.c
+++ b/rand/rands.c
diff --git a/randsd.c b/rand/randsd.c
index 077382eea..077382eea 100644
--- a/randsd.c
+++ b/rand/randsd.c
diff --git a/randsdui.c b/rand/randsdui.c
index 9039edab2..9039edab2 100644
--- a/randsdui.c
+++ b/rand/randsdui.c