From e2f552cecaa9b0e98d5be67d8767d19e8f0d00f1 Mon Sep 17 00:00:00 2001 From: Juanjo Garcia-Ripoll Date: Sun, 6 Oct 2013 10:08:30 +0200 Subject: [PATCH] Remove further files from our GMP build --- src/gmp/Makefile.am | 5 ++--- src/gmp/Makefile.in | 49 +++++++++------------------------------------ 2 files changed, 12 insertions(+), 42 deletions(-) diff --git a/src/gmp/Makefile.am b/src/gmp/Makefile.am index 16ddb08f3..c188722bd 100644 --- a/src/gmp/Makefile.am +++ b/src/gmp/Makefile.am @@ -247,9 +247,8 @@ libgmp_la_SOURCES = gmp-impl.h longlong.h randmt.h \ randmts.c rands.c randsd.c randsdui.c randbui.c randmui.c version.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) + $(MPZ_OBJECTS) $(MPN_OBJECTS) @mpn_objs_in_libgmp@ \ + # $(PRINTF_OBJECTS) $(SCANF_OBJECTS) $(MPF_OBJECTS) $(MPQ_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/src/gmp/Makefile.in b/src/gmp/Makefile.in index 7496127d1..6b018613f 100644 --- a/src/gmp/Makefile.in +++ b/src/gmp/Makefile.in @@ -86,26 +86,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \ "$(DESTDIR)$(includeexecdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = mpf/init$U.lo mpf/init2$U.lo mpf/set$U.lo \ - mpf/set_ui$U.lo mpf/set_si$U.lo mpf/set_str$U.lo \ - mpf/set_d$U.lo mpf/set_z$U.lo mpf/iset$U.lo mpf/iset_ui$U.lo \ - mpf/iset_si$U.lo mpf/iset_str$U.lo mpf/iset_d$U.lo \ - mpf/clear$U.lo mpf/get_str$U.lo mpf/dump$U.lo mpf/size$U.lo \ - mpf/eq$U.lo mpf/reldiff$U.lo mpf/sqrt$U.lo mpf/random2$U.lo \ - mpf/inp_str$U.lo mpf/out_str$U.lo mpf/add$U.lo mpf/add_ui$U.lo \ - mpf/sub$U.lo mpf/sub_ui$U.lo mpf/ui_sub$U.lo mpf/mul$U.lo \ - mpf/mul_ui$U.lo mpf/div$U.lo mpf/div_ui$U.lo mpf/cmp$U.lo \ - mpf/cmp_d$U.lo mpf/cmp_ui$U.lo mpf/cmp_si$U.lo \ - mpf/mul_2exp$U.lo mpf/div_2exp$U.lo mpf/abs$U.lo mpf/neg$U.lo \ - mpf/set_q$U.lo mpf/get_d$U.lo mpf/get_d_2exp$U.lo \ - mpf/set_dfl_prec$U.lo mpf/set_prc$U.lo mpf/set_prc_raw$U.lo \ - mpf/get_dfl_prec$U.lo mpf/get_prc$U.lo mpf/ui_div$U.lo \ - mpf/sqrt_ui$U.lo mpf/ceilfloor$U.lo mpf/trunc$U.lo \ - mpf/pow_ui$U.lo mpf/urandomb$U.lo mpf/swap$U.lo \ - mpf/fits_sint$U.lo mpf/fits_slong$U.lo mpf/fits_sshort$U.lo \ - mpf/fits_uint$U.lo mpf/fits_ulong$U.lo mpf/fits_ushort$U.lo \ - mpf/get_si$U.lo mpf/get_ui$U.lo mpf/int_p$U.lo -am__DEPENDENCIES_2 = mpz/abs$U.lo mpz/add$U.lo mpz/add_ui$U.lo \ +am__DEPENDENCIES_1 = mpz/abs$U.lo mpz/add$U.lo mpz/add_ui$U.lo \ mpz/aorsmul$U.lo mpz/aorsmul_i$U.lo mpz/and$U.lo \ mpz/array_init$U.lo mpz/bin_ui$U.lo mpz/bin_uiui$U.lo \ mpz/cdiv_q$U.lo mpz/cdiv_q_ui$U.lo mpz/cdiv_qr$U.lo \ @@ -151,17 +132,8 @@ am__DEPENDENCIES_2 = mpz/abs$U.lo mpz/add$U.lo mpz/add_ui$U.lo \ mpz/tdiv_r_2exp$U.lo mpz/tdiv_r_ui$U.lo mpz/tstbit$U.lo \ mpz/ui_pow_ui$U.lo mpz/ui_sub$U.lo mpz/urandomb$U.lo \ mpz/urandomm$U.lo mpz/xor$U.lo -am__DEPENDENCIES_3 = mpq/abs$U.lo mpq/aors$U.lo mpq/canonicalize$U.lo \ - mpq/clear$U.lo mpq/cmp$U.lo mpq/cmp_si$U.lo mpq/cmp_ui$U.lo \ - mpq/div$U.lo mpq/get_d$U.lo mpq/get_den$U.lo mpq/get_num$U.lo \ - mpq/get_str$U.lo mpq/init$U.lo mpq/inp_str$U.lo mpq/inv$U.lo \ - mpq/md_2exp$U.lo mpq/mul$U.lo mpq/neg$U.lo mpq/out_str$U.lo \ - mpq/set$U.lo mpq/set_den$U.lo mpq/set_num$U.lo mpq/set_si$U.lo \ - mpq/set_str$U.lo mpq/set_ui$U.lo mpq/equal$U.lo mpq/set_z$U.lo \ - mpq/set_d$U.lo mpq/set_f$U.lo mpq/swap$U.lo -am__DEPENDENCIES_4 = mpn/fib_table$U.lo mpn/mp_bases$U.lo -am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) +am__DEPENDENCIES_2 = mpn/fib_table$U.lo mpn/mp_bases$U.lo +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_libgmp_la_OBJECTS = assert$U.lo compat$U.lo errno$U.lo \ extract-dbl$U.lo invalid$U.lo memory$U.lo mp_bpl$U.lo \ mp_clz_tab$U.lo mp_dv_tab$U.lo mp_minv_tab$U.lo \ @@ -170,21 +142,21 @@ am_libgmp_la_OBJECTS = assert$U.lo compat$U.lo errno$U.lo \ randmt$U.lo randmts$U.lo rands$U.lo randsd$U.lo randsdui$U.lo \ randbui$U.lo randmui$U.lo version$U.lo libgmp_la_OBJECTS = $(am_libgmp_la_OBJECTS) -am__DEPENDENCIES_6 = cxx/isfuns.lo cxx/ismpf.lo cxx/ismpq.lo \ +am__DEPENDENCIES_4 = cxx/isfuns.lo cxx/ismpf.lo cxx/ismpq.lo \ cxx/ismpz.lo cxx/ismpznw.lo cxx/osdoprnti.lo cxx/osfuns.lo \ cxx/osmpf.lo cxx/osmpq.lo cxx/osmpz.lo -am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6) libgmp.la +am__DEPENDENCIES_5 = $(am__DEPENDENCIES_4) libgmp.la am_libgmpxx_la_OBJECTS = dummy.lo libgmpxx_la_OBJECTS = $(am_libgmpxx_la_OBJECTS) @WANT_CXX_TRUE@am_libgmpxx_la_rpath = -rpath $(libdir) -am__DEPENDENCIES_8 = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo \ +am__DEPENDENCIES_6 = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo \ mpbsd/powm$U.lo mpbsd/sub$U.lo mpbsd/cmp$U.lo mpbsd/mfree$U.lo \ mpbsd/mtox$U.lo mpbsd/realloc$U.lo mpbsd/gcd$U.lo \ mpbsd/itom$U.lo mpbsd/min$U.lo mpbsd/mul$U.lo mpbsd/mout$U.lo \ mpbsd/rpow$U.lo mpbsd/sdiv$U.lo mpbsd/sqrtrem$U.lo \ mpbsd/xtom$U.lo -am__DEPENDENCIES_9 = $(srcdir)/libmp.sym $(am__DEPENDENCIES_8) \ - $(am__DEPENDENCIES_4) mpz/add$U.lo mpz/gcdext$U.lo \ +am__DEPENDENCIES_7 = $(srcdir)/libmp.sym $(am__DEPENDENCIES_6) \ + $(am__DEPENDENCIES_2) mpz/add$U.lo mpz/gcdext$U.lo \ mpz/invert$U.lo mpz/mul$U.lo mpz/n_pow_ui$U.lo \ mpz/realloc$U.lo mpz/set$U.lo mpz/sub$U.lo mpz/tdiv_q$U.lo am_libmp_la_OBJECTS = assert$U.lo errno$U.lo memory$U.lo mp_bpl$U.lo \ @@ -613,9 +585,8 @@ libgmp_la_SOURCES = gmp-impl.h longlong.h randmt.h \ 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) + $(MPZ_OBJECTS) $(MPN_OBJECTS) @mpn_objs_in_libgmp@ \ + # $(PRINTF_OBJECTS) $(SCANF_OBJECTS) $(MPF_OBJECTS) $(MPQ_OBJECTS) libgmp_la_LIBADD = $(libgmp_la_DEPENDENCIES) libgmp_la_LDFLAGS = $(GMP_LDFLAGS) $(LIBGMP_LDFLAGS) \