summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am19
-rw-r--r--configure.ac14
-rw-r--r--doc/mpc.texi (renamed from mpc.texi)0
-rw-r--r--doc/version.texi (renamed from version.texi)0
-rw-r--r--src/Makefile.am11
-rw-r--r--src/abs.c (renamed from abs.c)0
-rw-r--r--src/add.c (renamed from add.c)0
-rw-r--r--src/add_fr.c (renamed from add_fr.c)0
-rw-r--r--src/add_ui.c (renamed from add_ui.c)0
-rw-r--r--src/clear.c (renamed from clear.c)0
-rw-r--r--src/cmp.c (renamed from cmp.c)0
-rw-r--r--src/cmp_si_si.c (renamed from cmp_si_si.c)0
-rw-r--r--src/conj.c (renamed from conj.c)0
-rw-r--r--src/cos.c (renamed from cos.c)0
-rw-r--r--src/div.c (renamed from div.c)0
-rw-r--r--src/div_2exp.c (renamed from div_2exp.c)0
-rw-r--r--src/div_fr.c (renamed from div_fr.c)0
-rw-r--r--src/div_ui.c (renamed from div_ui.c)0
-rw-r--r--src/exp.c (renamed from exp.c)0
-rw-r--r--src/get_prec.c (renamed from get_prec.c)0
-rw-r--r--src/get_prec2.c (renamed from get_prec2.c)0
-rw-r--r--src/init.c (renamed from init.c)0
-rw-r--r--src/init2.c (renamed from init2.c)0
-rw-r--r--src/init3.c (renamed from init3.c)0
-rw-r--r--src/inp_str.c (renamed from inp_str.c)0
-rw-r--r--src/mpc-impl.h (renamed from mpc-impl.h)0
-rw-r--r--src/mpc.h (renamed from mpc.h)0
-rw-r--r--src/mul.c (renamed from mul.c)0
-rw-r--r--src/mul_2exp.c (renamed from mul_2exp.c)0
-rw-r--r--src/mul_fr.c (renamed from mul_fr.c)0
-rw-r--r--src/mul_i.c (renamed from mul_i.c)0
-rw-r--r--src/mul_si.c (renamed from mul_si.c)0
-rw-r--r--src/mul_ui.c (renamed from mul_ui.c)0
-rw-r--r--src/neg.c (renamed from neg.c)0
-rw-r--r--src/norm.c (renamed from norm.c)0
-rw-r--r--src/out_str.c (renamed from out_str.c)0
-rw-r--r--src/random.c (renamed from random.c)0
-rw-r--r--src/random2.c (renamed from random2.c)0
-rw-r--r--src/set.c (renamed from set.c)0
-rw-r--r--src/set_d_d.c (renamed from set_d_d.c)0
-rw-r--r--src/set_dfl_prec.c (renamed from set_dfl_prec.c)0
-rw-r--r--src/set_prec.c (renamed from set_prec.c)0
-rw-r--r--src/set_si_si.c (renamed from set_si_si.c)0
-rw-r--r--src/set_ui_fr.c (renamed from set_ui_fr.c)0
-rw-r--r--src/set_ui_ui.c (renamed from set_ui_ui.c)0
-rw-r--r--src/sin.c (renamed from sin.c)0
-rw-r--r--src/sqr.c (renamed from sqr.c)0
-rw-r--r--src/sqrt.c (renamed from sqrt.c)0
-rw-r--r--src/sub.c (renamed from sub.c)0
-rw-r--r--src/sub_ui.c (renamed from sub_ui.c)0
-rw-r--r--src/uceil_log2.c (renamed from uceil_log2.c)0
-rw-r--r--src/ui_div.c (renamed from ui_div.c)0
-rw-r--r--src/ui_ui_sub.c (renamed from ui_ui_sub.c)0
-rw-r--r--tests/Makefile.am10
-rw-r--r--tests/tabs.c (renamed from tabs.c)0
-rw-r--r--tests/tcos.c (renamed from tcos.c)0
-rw-r--r--tests/tdiv.c (renamed from tdiv.c)0
-rw-r--r--tests/test.c (renamed from test.c)0
-rw-r--r--tests/texp.c (renamed from texp.c)0
-rw-r--r--tests/tmul.c (renamed from tmul.c)0
-rw-r--r--tests/tsin.c (renamed from tsin.c)0
-rw-r--r--tests/tsqr.c (renamed from tsqr.c)0
62 files changed, 30 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am
index 620408c..4d5aeae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
-include_HEADERS = mpc.h
+SUBDIRS = src tests
-lib_LTLIBRARIES = libmpc.la
-libmpc_la_SOURCES = mpc-impl.h abs.c add.c add_fr.c add_ui.c clear.c \
-cmp.c cmp_si_si.c conj.c cos.c div_2exp.c div.c div_fr.c div_ui.c exp.c \
-get_prec2.c get_prec.c init2.c init3.c init.c inp_str.c mul_2exp.c mul.c \
-mul_fr.c mul_i.c mul_si.c mul_ui.c neg.c norm.c out_str.c random2.c random.c \
-set.c set_d_d.c set_dfl_prec.c set_prec.c set_si_si.c set_ui_fr.c \
-set_ui_ui.c sin.c sqr.c sqrt.c sub.c sub_ui.c uceil_log2.c ui_div.c \
-ui_ui_sub.c
+include_HEADERS = $(top_srcdir)/src/mpc.h
-LDADD = $(top_builddir)/libmpc.la
-check_INCLUDES = -I$(top_srcdir)
-check_PROGRAMS = test tabs tcos tdiv texp tmul tsin tsqr
-
-TESTS = $(check_PROGRAMS)
-CLEANFILES = $(top_builddir)/mpc_test
-
-info_TEXINFOS = mpc.texi
diff --git a/configure.ac b/configure.ac
index 1cbc756..e5dc94f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_INIT(mpc, 0.4.7, mpc-discuss@lists.gforge.inria.fr)
-AC_CONFIG_SRCDIR([mpc-impl.h])
+AC_CONFIG_SRCDIR([src/mpc-impl.h])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([1.9 -Wall -Werror])
@@ -13,15 +13,15 @@ AM_CFLAGS="-O2 -g"
dnl Extra arguments to configure
AC_ARG_WITH([mpfr],
- AC_HELP_STRING([--with-mpfr=DIR],
- [MPFR install directory]),
+ [AC_HELP_STRING([--with-mpfr=DIR],
+ [MPFR install directory])],
[
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
])
AC_ARG_WITH([gmp],
- AC_HELP_STRING([--with-gmp=DIR],
- [GMP install directory]),
+ [AC_HELP_STRING([--with-gmp=DIR],
+ [GMP install directory])],
[
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
@@ -33,7 +33,7 @@ AC_PROG_LIBTOOL
# Checks for libraries.
AC_CHECK_LIB([mpfr], [mpfr_clear],,
- AC_MSG_ERROR([MPC library needs the MPFR library]))
+ [AC_MSG_ERROR([MPC library needs the MPFR library])])
# Checks for header files.
AC_HEADER_STDC
@@ -45,5 +45,5 @@ AC_TYPE_SIZE_T
# Checks for library functions.
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
AC_OUTPUT
diff --git a/mpc.texi b/doc/mpc.texi
index 507c6dc..507c6dc 100644
--- a/mpc.texi
+++ b/doc/mpc.texi
diff --git a/version.texi b/doc/version.texi
index ddf42b9..ddf42b9 100644
--- a/version.texi
+++ b/doc/version.texi
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..de86ba2
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,11 @@
+## src/Makefile.am -- Process this file with automake to produce Makefile.in
+
+lib_LTLIBRARIES = libmpc.la
+libmpc_la_SOURCES = mpc-impl.h abs.c add.c add_fr.c add_ui.c clear.c \
+cmp.c cmp_si_si.c conj.c cos.c div_2exp.c div.c div_fr.c div_ui.c exp.c \
+get_prec2.c get_prec.c init2.c init3.c init.c inp_str.c mul_2exp.c mul.c \
+mul_fr.c mul_i.c mul_si.c mul_ui.c neg.c norm.c out_str.c random2.c random.c \
+set.c set_d_d.c set_dfl_prec.c set_prec.c set_si_si.c set_ui_fr.c \
+set_ui_ui.c sin.c sqr.c sqrt.c sub.c sub_ui.c uceil_log2.c ui_div.c \
+ui_ui_sub.c
+
diff --git a/abs.c b/src/abs.c
index dd9e0ef..dd9e0ef 100644
--- a/abs.c
+++ b/src/abs.c
diff --git a/add.c b/src/add.c
index e6274e7..e6274e7 100644
--- a/add.c
+++ b/src/add.c
diff --git a/add_fr.c b/src/add_fr.c
index db31257..db31257 100644
--- a/add_fr.c
+++ b/src/add_fr.c
diff --git a/add_ui.c b/src/add_ui.c
index 15e4b0e..15e4b0e 100644
--- a/add_ui.c
+++ b/src/add_ui.c
diff --git a/clear.c b/src/clear.c
index 4cab3a1..4cab3a1 100644
--- a/clear.c
+++ b/src/clear.c
diff --git a/cmp.c b/src/cmp.c
index 6d6aecf..6d6aecf 100644
--- a/cmp.c
+++ b/src/cmp.c
diff --git a/cmp_si_si.c b/src/cmp_si_si.c
index 67b65ee..67b65ee 100644
--- a/cmp_si_si.c
+++ b/src/cmp_si_si.c
diff --git a/conj.c b/src/conj.c
index 085b2ac..085b2ac 100644
--- a/conj.c
+++ b/src/conj.c
diff --git a/cos.c b/src/cos.c
index e13d6ca..e13d6ca 100644
--- a/cos.c
+++ b/src/cos.c
diff --git a/div.c b/src/div.c
index 73e64cd..73e64cd 100644
--- a/div.c
+++ b/src/div.c
diff --git a/div_2exp.c b/src/div_2exp.c
index 4f1e400..4f1e400 100644
--- a/div_2exp.c
+++ b/src/div_2exp.c
diff --git a/div_fr.c b/src/div_fr.c
index 86c3352..86c3352 100644
--- a/div_fr.c
+++ b/src/div_fr.c
diff --git a/div_ui.c b/src/div_ui.c
index 5e437a3..5e437a3 100644
--- a/div_ui.c
+++ b/src/div_ui.c
diff --git a/exp.c b/src/exp.c
index 51c71d1..51c71d1 100644
--- a/exp.c
+++ b/src/exp.c
diff --git a/get_prec.c b/src/get_prec.c
index 9687a19..9687a19 100644
--- a/get_prec.c
+++ b/src/get_prec.c
diff --git a/get_prec2.c b/src/get_prec2.c
index c646e22..c646e22 100644
--- a/get_prec2.c
+++ b/src/get_prec2.c
diff --git a/init.c b/src/init.c
index 2fe586c..2fe586c 100644
--- a/init.c
+++ b/src/init.c
diff --git a/init2.c b/src/init2.c
index 304a8a2..304a8a2 100644
--- a/init2.c
+++ b/src/init2.c
diff --git a/init3.c b/src/init3.c
index 5a23221..5a23221 100644
--- a/init3.c
+++ b/src/init3.c
diff --git a/inp_str.c b/src/inp_str.c
index eaade41..eaade41 100644
--- a/inp_str.c
+++ b/src/inp_str.c
diff --git a/mpc-impl.h b/src/mpc-impl.h
index 058c4c8..058c4c8 100644
--- a/mpc-impl.h
+++ b/src/mpc-impl.h
diff --git a/mpc.h b/src/mpc.h
index 4caf9ac..4caf9ac 100644
--- a/mpc.h
+++ b/src/mpc.h
diff --git a/mul.c b/src/mul.c
index 0afd0db..0afd0db 100644
--- a/mul.c
+++ b/src/mul.c
diff --git a/mul_2exp.c b/src/mul_2exp.c
index 54cd0ca..54cd0ca 100644
--- a/mul_2exp.c
+++ b/src/mul_2exp.c
diff --git a/mul_fr.c b/src/mul_fr.c
index 10786f3..10786f3 100644
--- a/mul_fr.c
+++ b/src/mul_fr.c
diff --git a/mul_i.c b/src/mul_i.c
index 7ca8cc4..7ca8cc4 100644
--- a/mul_i.c
+++ b/src/mul_i.c
diff --git a/mul_si.c b/src/mul_si.c
index 81f30e5..81f30e5 100644
--- a/mul_si.c
+++ b/src/mul_si.c
diff --git a/mul_ui.c b/src/mul_ui.c
index 33b5e81..33b5e81 100644
--- a/mul_ui.c
+++ b/src/mul_ui.c
diff --git a/neg.c b/src/neg.c
index caf8566..caf8566 100644
--- a/neg.c
+++ b/src/neg.c
diff --git a/norm.c b/src/norm.c
index 087230e..087230e 100644
--- a/norm.c
+++ b/src/norm.c
diff --git a/out_str.c b/src/out_str.c
index ab56b94..ab56b94 100644
--- a/out_str.c
+++ b/src/out_str.c
diff --git a/random.c b/src/random.c
index feb17d7..feb17d7 100644
--- a/random.c
+++ b/src/random.c
diff --git a/random2.c b/src/random2.c
index bb08f04..bb08f04 100644
--- a/random2.c
+++ b/src/random2.c
diff --git a/set.c b/src/set.c
index d9737e3..d9737e3 100644
--- a/set.c
+++ b/src/set.c
diff --git a/set_d_d.c b/src/set_d_d.c
index 8cb49f1..8cb49f1 100644
--- a/set_d_d.c
+++ b/src/set_d_d.c
diff --git a/set_dfl_prec.c b/src/set_dfl_prec.c
index 920e8a1..920e8a1 100644
--- a/set_dfl_prec.c
+++ b/src/set_dfl_prec.c
diff --git a/set_prec.c b/src/set_prec.c
index 1d254be..1d254be 100644
--- a/set_prec.c
+++ b/src/set_prec.c
diff --git a/set_si_si.c b/src/set_si_si.c
index 648050f..648050f 100644
--- a/set_si_si.c
+++ b/src/set_si_si.c
diff --git a/set_ui_fr.c b/src/set_ui_fr.c
index af1226b..af1226b 100644
--- a/set_ui_fr.c
+++ b/src/set_ui_fr.c
diff --git a/set_ui_ui.c b/src/set_ui_ui.c
index 0086010..0086010 100644
--- a/set_ui_ui.c
+++ b/src/set_ui_ui.c
diff --git a/sin.c b/src/sin.c
index ad1d6ef..ad1d6ef 100644
--- a/sin.c
+++ b/src/sin.c
diff --git a/sqr.c b/src/sqr.c
index 315f65f..315f65f 100644
--- a/sqr.c
+++ b/src/sqr.c
diff --git a/sqrt.c b/src/sqrt.c
index 35d3908..35d3908 100644
--- a/sqrt.c
+++ b/src/sqrt.c
diff --git a/sub.c b/src/sub.c
index c6a3c68..c6a3c68 100644
--- a/sub.c
+++ b/src/sub.c
diff --git a/sub_ui.c b/src/sub_ui.c
index b298400..b298400 100644
--- a/sub_ui.c
+++ b/src/sub_ui.c
diff --git a/uceil_log2.c b/src/uceil_log2.c
index f037437..f037437 100644
--- a/uceil_log2.c
+++ b/src/uceil_log2.c
diff --git a/ui_div.c b/src/ui_div.c
index 474deb0..474deb0 100644
--- a/ui_div.c
+++ b/src/ui_div.c
diff --git a/ui_ui_sub.c b/src/ui_ui_sub.c
index bf75f67..bf75f67 100644
--- a/ui_ui_sub.c
+++ b/src/ui_ui_sub.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..dc0f6a6
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,10 @@
+## Makefile.am -- Process this file with automake to produce Makefile.in
+LDADD = $(top_builddir)/src/libmpc.la
+
+
+AM_CPPFLAGS = -I$(top_srcdir)/src
+check_PROGRAMS = test tabs tcos tdiv texp tmul tsin tsqr
+
+TESTS = $(check_PROGRAMS)
+CLEANFILES = mpc_test
+
diff --git a/tabs.c b/tests/tabs.c
index 63397e7..63397e7 100644
--- a/tabs.c
+++ b/tests/tabs.c
diff --git a/tcos.c b/tests/tcos.c
index 0ff00fc..0ff00fc 100644
--- a/tcos.c
+++ b/tests/tcos.c
diff --git a/tdiv.c b/tests/tdiv.c
index d93f894..d93f894 100644
--- a/tdiv.c
+++ b/tests/tdiv.c
diff --git a/test.c b/tests/test.c
index e9ebf08..e9ebf08 100644
--- a/test.c
+++ b/tests/test.c
diff --git a/texp.c b/tests/texp.c
index 8450f30..8450f30 100644
--- a/texp.c
+++ b/tests/texp.c
diff --git a/tmul.c b/tests/tmul.c
index 604009d..604009d 100644
--- a/tmul.c
+++ b/tests/tmul.c
diff --git a/tsin.c b/tests/tsin.c
index 8fc0899..8fc0899 100644
--- a/tsin.c
+++ b/tests/tsin.c
diff --git a/tsqr.c b/tests/tsqr.c
index 470680e..470680e 100644
--- a/tsqr.c
+++ b/tests/tsqr.c
View Lorry Controller Status