for file in $(find -name Makefile.am) ; do sed -e "s/libgmp\.a/libmpir.a/g" $file > temp ; mv temp $file ; done

for file in $(find -name Makefile.am) ; do sed -e "s/libgmp\.la/libmpir.la/g" $file > temp ; mv temp $file ; done
for file in $(find -name Makefile.am) ; do sed -e "s/libgmpxx\.la/libmpirxx.la/g" $file > temp ; mv temp $file ; done
for file in $(find -name Makefile.am) ; do sed -e "s/libgmpxx\.a/libmpirxx.a/g" $file > temp ; mv temp $file ; done
This commit is contained in:
jasonmoxham 2009-02-12 11:51:33 +00:00
parent 9b722633b9
commit 31ec9cdbeb
14 changed files with 24 additions and 24 deletions

View File

@ -32,7 +32,7 @@
AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
# Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the
# Libtool -version-info for libmpir.la and libmp.la. See "Versioning" in the
# libtool manual.
#
# 1. No interfaces changed, only implementations (good): Increment REVISION.
@ -113,7 +113,7 @@ EXTRA_DIST += mpirxx.h
includeexecdir = $(exec_prefix)/include
include_HEADERS = $(GMPXX_HEADERS_OPTION)
nodist_includeexec_HEADERS = mpir.h $(MPBSD_HEADERS_OPTION)
lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION)
lib_LTLIBRARIES = libmpir.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION)
BUILT_SOURCES = mpir.h
@ -234,10 +234,10 @@ MPBSD_OBJECTS = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo \
mpbsd/sdiv$U.lo mpbsd/sqrtrem$U.lo mpbsd/xtom$U.lo
# In libtool 1.5 it doesn't work to build libgmp.la from the convenience
# In libtool 1.5 it doesn't work to build libmpir.la from the convenience
# libraries like mpz/libmpz.la. Or rather it works, but it ends up putting
# PIC objects into libgmp.a if shared and static are both built. (The PIC
# objects go into mpz/.libs/libmpz.a, and thence into .libs/libgmp.a.)
# PIC objects into libmpir.a if shared and static are both built. (The PIC
# objects go into mpz/.libs/libmpz.a, and thence into .libs/libmpir.a.)
#
# For now the big lists of objects above are used. Something like mpz/*.lo
# would probably work, but might risk missing something out or getting
@ -268,10 +268,10 @@ libgmp_la_LDFLAGS = $(GMP_LDFLAGS) $(LIBGMP_LDFLAGS) \
# file.
if WANT_CXX
GMPXX_LTLIBRARIES_OPTION = libgmpxx.la
GMPXX_LTLIBRARIES_OPTION = libmpirxx.la
endif
libgmpxx_la_SOURCES = cxx/dummy.cc
libgmpxx_la_DEPENDENCIES = $(CXX_OBJECTS) libgmp.la
libgmpxx_la_DEPENDENCIES = $(CXX_OBJECTS) libmpir.la
libgmpxx_la_LIBADD = $(libgmpxx_la_DEPENDENCIES)
libgmpxx_la_LDFLAGS = $(GMP_LDFLAGS) $(LIBGMPXX_LDFLAGS) \
-version-info $(LIBGMPXX_LT_CURRENT):$(LIBGMPXX_LT_REVISION):$(LIBGMPXX_LT_AGE)

View File

@ -24,13 +24,13 @@ SUBDIRS = calc expr
EXTRA_DIST = perl
INCLUDES = -I$(top_srcdir)
LDADD = $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/libmpir.la
qcn_LDADD = $(LDADD) $(LIBM)
primes_LDADD = $(LDADD) $(LIBM)
# None of these programs are built by default, but "make <whatever>" will
# build them once libgmp.la is built.
# build them once libmpir.la is built.
#
EXTRA_PROGRAMS = factorize isprime pexpr primes qcn

View File

@ -26,7 +26,7 @@ INCLUDES = -I$(top_srcdir)
# calclex.c), but it's included here for the benefit of anyone rebuilding
# with some other lex.
#
LDADD = $(top_builddir)/libgmp.la $(LIBREADLINE) $(LIBCURSES) $(LEXLIB)
LDADD = $(top_builddir)/libmpir.la $(LIBREADLINE) $(LIBCURSES) $(LEXLIB)
EXTRA_PROGRAMS = calc
AM_YFLAGS = -d

View File

@ -34,7 +34,7 @@ libexpr_a_SOURCES = expr.h expr-impl.h \
expr.c exprv.c exprz.c exprza.c exprq.c exprqa.c exprf.c exprfa.c
EXTRA_PROGRAMS = run-expr t-expr
LDADD = libexpr.a $(top_builddir)/libgmp.la
LDADD = libexpr.a $(top_builddir)/libmpir.la
t_expr_LDADD = $(top_builddir)/tests/libtests.la $(LDADD)
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES)

View File

@ -25,7 +25,7 @@ SUBDIRS = . devel mpn mpz mpq mpf rand misc cxx mpbsd
include ../mpn/Makeasm.am
INCLUDES = -I$(top_srcdir)
LDADD = libtests.la $(top_builddir)/libgmp.la
LDADD = libtests.la $(top_builddir)/libmpir.la
check_LTLIBRARIES = libtests.la
@ -33,7 +33,7 @@ EXTRA_libtests_la_SOURCES = amd64call.asm amd64check.c core2call.asm x86call.asm
libtests_la_SOURCES = tests.h \
memory.c misc.c refmpf.c refmpn.c refmpq.c refmpz.c spinner.c trace.c
libtests_la_DEPENDENCIES = @CALLING_CONVENTIONS_OBJS@
libtests_la_LIBADD = $(libtests_la_DEPENDENCIES) $(top_builddir)/libgmp.la
libtests_la_LIBADD = $(libtests_la_DEPENDENCIES) $(top_builddir)/libmpir.la
check_PROGRAMS = t-bswap t-constants t-count_zeros t-gmpmax t-hightomask \
t-modlinv t-popc t-parity t-sub

View File

@ -28,8 +28,8 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = -L$(top_builddir)/.libs \
$(top_builddir)/tests/libtests.la \
$(top_builddir)/libgmpxx.la \
$(top_builddir)/libgmp.la
$(top_builddir)/libmpirxx.la \
$(top_builddir)/libmpir.la
if WANT_CXX
check_PROGRAMS = t-assign t-binary t-cast t-constr t-headers \

View File

@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
EXTRA_PROGRAMS = \
aors_n anymul_1 copy divmod_1 divrem shift logops_n mul_N addmul_N try

View File

@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
check_PROGRAMS = t-printf t-scanf t-locale
TESTS = $(check_PROGRAMS)

View File

@ -22,7 +22,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
check_PROGRAMS = t-add t-sub t-conv t-sqrt t-sqrt_ui t-muldiv t-dm2exp reuse \
t-cmp_d t-cmp_si t-div t-fits t-get_d t-get_d_2exp \

View File

@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
check_PROGRAMS = t-asmtype t-aors_1 t-divrem_1 t-fat t-get_d \
t-instrument t-iord_u t-mp_bases t-perfsqr t-scan

View File

@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
check_PROGRAMS = t-aors t-cmp t-cmp_ui t-cmp_si t-equal t-get_d t-get_str \
t-inp_str t-md_2exp t-set_f t-set_str

View File

@ -24,7 +24,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
check_PROGRAMS = t-addsub t-cmp t-mul t-mul_i t-tdiv t-tdiv_ui t-fdiv \
t-fdiv_ui t-cdiv_ui t-gcd t-gcd_ui t-lcm dive dive_ui t-sqrtrem convert io \

View File

@ -21,7 +21,7 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
check_PROGRAMS = t-iset t-lc2exp t-mt t-rand t-urbui t-urmui t-urndmm
TESTS = $(check_PROGRAMS)
@ -35,7 +35,7 @@ stat_LDADD = libstat.la
EXTRA_LTLIBRARIES = libstat.la
libstat_la_SOURCES = gmpstat.h statlib.c zdiv_round.c
libstat_la_LIBADD = $(top_builddir)/libgmp.la $(LIBM)
libstat_la_LIBADD = $(top_builddir)/libmpir.la $(LIBM)
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LTLIBRARIES)

View File

@ -52,7 +52,7 @@ libspeed_la_SOURCES = \
sb_div.c sb_inv.c
libspeed_la_DEPENDENCIES = $(SPEED_CYCLECOUNTER_OBJ) \
$(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
$(top_builddir)/tests/libtests.la $(top_builddir)/libmpir.la
libspeed_la_LIBADD = $(libspeed_la_DEPENDENCIES) $(LIBM)
libspeed_la_LDFLAGS = $(STATIC)