From 07b64f72a2a49cbc3f7287b11e7ceb1b655b6c99 Mon Sep 17 00:00:00 2001 From: jasonmoxham Date: Wed, 29 Jul 2009 15:10:46 +0000 Subject: [PATCH] fix trac ticket 146 , ie clean up after a fat build --- Makefile.am | 2 +- Makefile.in | 2 +- configure | 2 ++ configure.in | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f4da9df8..f0844806 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,7 @@ lib_LTLIBRARIES += $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION) BUILT_SOURCES = mpir.h -DISTCLEANFILES = $(BUILT_SOURCES) config.m4 @gmp_srclinks@ +DISTCLEANFILES = $(BUILT_SOURCES) config.m4 fat.h @gmp_srclinks@ # Tell mpir.h it's building gmp, not an application, used by windows DLL stuff. INCLUDES=-D__GMP_WITHIN_GMP diff --git a/Makefile.in b/Makefile.in index e346c04f..4babda51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -542,7 +542,7 @@ lib_LTLIBRARIES = libmpir.la $(am__append_2) \ $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION) BUILT_SOURCES = mpir.h mp.h mpz/fac_ui.h fib_table.h mpn/fib_table.c \ mp_bases.h mpn/mp_bases.c mpn/perfsqr.h -DISTCLEANFILES = $(BUILT_SOURCES) config.m4 @gmp_srclinks@ \ +DISTCLEANFILES = $(BUILT_SOURCES) config.m4 fat.h @gmp_srclinks@ \ gen-fac_ui$(EXEEXT_FOR_BUILD) gen-fib$(EXEEXT_FOR_BUILD) \ gen-bases$(EXEEXT_FOR_BUILD) gen-psqr$(EXEEXT_FOR_BUILD) diff --git a/configure b/configure index e14d5647..d25055ae 100755 --- a/configure +++ b/configure @@ -29789,6 +29789,7 @@ esac # that macro doesn't accept a set of separate commands generated # by shell code. # + gmp_srclinks="$gmp_srclinks mpn/${tmp_prefix}_$tmp_fn.$tmp_ext" case $tmp_ext in as) echo "; mpn_$tmp_fbase - from $tmp_dir directory for fat binary. @@ -29826,6 +29827,7 @@ include($mpn_relative_top_srcdir/mpn/$tmp_dir/$tmp_base.asm) " >mpn/${tmp_prefix}_$tmp_fn.asm ;; c) + echo "/* mpn_$tmp_fbase - from $tmp_dir directory for fat binary. Generated by configure - DO NOT EDIT. */ diff --git a/configure.in b/configure.in index c1c525e5..f29b9d62 100644 --- a/configure.in +++ b/configure.in @@ -2747,6 +2747,7 @@ DECL_$tmp_fbase (__MPN(${tmp_fbase}_init));" >>fat.h # that macro doesn't accept a set of separate commands generated # by shell code. # + gmp_srclinks="$gmp_srclinks mpn/${tmp_prefix}_$tmp_fn.$tmp_ext" case $tmp_ext in as) echo ["; mpn_$tmp_fbase - from $tmp_dir directory for fat binary. @@ -2784,6 +2785,7 @@ include][($mpn_relative_top_srcdir/mpn/$tmp_dir/$tmp_base.asm) "] >mpn/${tmp_prefix}_$tmp_fn.asm ;; c) + echo ["/* mpn_$tmp_fbase - from $tmp_dir directory for fat binary. Generated by configure - DO NOT EDIT. */