From 2e1a71756e754ada402efe9f5e2d6378dc11e496 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 13 Dec 2001 23:50:11 +0000 Subject: * Makefile.shared: New file. * libc/sys/linux/shared.ld: New file. * libm/machine/*: New files. * libm/machine/i386/*: New files. * Makefile.am: Add libtool support. Change math and mathfp references to variables. * configure.host: Add variables for libtool support. Add libm_machine_dir variable. * configure.in: Add objectlist variables, for libtool support. Add CC_FOR_BUILD tests. * libc/Makefile.am: Add libtool support. Change crt0.o reference to be a variable reference. * libc/configure.in: Add libtool support. Change sublib names to be lib${subdir}.la when using libtool. * libc/ctype/Makefile.am: Add libtool support. * libc/errno/Makefile.am: Likewise. * libc/locale/Makefile.am: Likewise. * libc/machine/Makefile.am: Likewise. * libc/machine/configure.in: Likewise. * libc/machine/i386/Makefile.am: Likewise. * libc/machine/i386/configure.in: Likewise. * libc/misc/Makefile.am: Likewise. * libc/posix/Makefile.am: Likewise. * libc/reent/Makefile.am: Likewise. * libc/signal/Makefile.am: Likewise. * libc/stdio/Makefile.am: Likewise. * libc/stdlib/Makefile.am: Likewise. * libc/string/Makefile.am: Likewise. * libc/sys/Makefile.am: Likewise. * libc/sys/configure.in: Likewise. * libc/sys/linux/Makefile.am: Add libtool support. Change awk reference to a variable reference. Change signal.h reference to a variable reference. * libc/sys/linux/configure.in: Add libtool support. * libc/syscalls/Makefile.am: Likewise. * libc/time/Makefile.am: Likewise. * libc/unix/Makefile.am: Likewise. * libm/Makefile.am: Add libtool support. Change math and mathfp references to variables. * libm/configure.in: Add libtool support. Add LIBM_MACHINE_LIB variable. * libm/common/Makefile.am: Add libtool support. * libm/math/Makefile.am: Likewise. * libm/mathfp/Makefile.am: Likewise. Regenerate all Makefile.in, aclocal.m4, and configure. --- newlib/libm/Makefile.in | 125 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 90 insertions(+), 35 deletions(-) (limited to 'newlib/libm/Makefile.in') diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in index 748d0b733..02d0b62ab 100644 --- a/newlib/libm/Makefile.in +++ b/newlib/libm/Makefile.in @@ -63,28 +63,39 @@ AR = @AR@ AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ +LDFLAGS = @LDFLAGS@ +LIBM_MACHINE_LIB = @LIBM_MACHINE_LIB@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NEWLIB_CFLAGS = @NEWLIB_CFLAGS@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ +aext = @aext@ +libm_machine_dir = @libm_machine_dir@ machine_dir = @machine_dir@ newlib_basedir = @newlib_basedir@ +oext = @oext@ sys_dir = @sys_dir@ AUTOMAKE_OPTIONS = cygnus -@NEWLIB_HW_FP_TRUE@SUBDIRS = \ -@NEWLIB_HW_FP_TRUE@mathfp common . -@NEWLIB_HW_FP_FALSE@SUBDIRS = \ -@NEWLIB_HW_FP_FALSE@math common . -@NEWLIB_HW_FP_TRUE@SUBLIBS = \ -@NEWLIB_HW_FP_TRUE@mathfp/lib.a common/lib.a -@NEWLIB_HW_FP_FALSE@SUBLIBS = \ -@NEWLIB_HW_FP_FALSE@math/lib.a common/lib.a +@NEWLIB_HW_FP_TRUE@MATHDIR = @NEWLIB_HW_FP_TRUE@mathfp +@NEWLIB_HW_FP_FALSE@MATHDIR = @NEWLIB_HW_FP_FALSE@math + +SUBDIRS = $(MATHDIR) common machine -noinst_LIBRARIES = libm.a +libm_la_LDFLAGS = -Xcompiler -nostdlib +@USE_LIBTOOL_TRUE@SUBLIBS = @USE_LIBTOOL_TRUE@$(MATHDIR)/lib$(MATHDIR).$(aext) common/libcommon.$(aext) $(LIBM_MACHINE_LIB) +@USE_LIBTOOL_FALSE@SUBLIBS = @USE_LIBTOOL_FALSE@$(MATHDIR)/lib.$(aext) common/lib.$(aext) $(LIBM_MACHINE_LIB) +@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libm.la +@USE_LIBTOOL_TRUE@libm_la_SOURCES = +@USE_LIBTOOL_TRUE@libm_la_LIBADD = @USE_LIBTOOL_TRUE@$(SUBLIBS) +@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@libm.a info_TEXINFOS = libm.texinfo @@ -100,15 +111,21 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libm_a_LIBADD = libm_a_SOURCES = libm.a.c libm_a_OBJECTS = libm.a.o +LTLIBRARIES = $(noinst_LTLIBRARIES) + +@USE_LIBTOOL_TRUE@libm_la_DEPENDENCIES = \ +@USE_LIBTOOL_TRUE@$(MATHDIR)/lib$(MATHDIR).$(aext) \ +@USE_LIBTOOL_TRUE@common/libcommon.$(aext) +@USE_LIBTOOL_TRUE@libm_la_OBJECTS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi` TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex INFO_DEPS = libm.info @@ -119,15 +136,15 @@ DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best -DIST_SUBDIRS = mathfp common . math common . -SOURCES = libm.a.c -OBJECTS = libm.a.o +DIST_SUBDIRS = mathfp math common machine +SOURCES = libm.a.c $(libm_la_SOURCES) +OBJECTS = libm.a.o $(libm_la_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi +.SUFFIXES: .S .c .dvi .info .lo .o .ps .s .texi .texinfo .txi $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -172,6 +189,37 @@ distclean-compile: maintainer-clean-compile: +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +mostlyclean-noinstLTLIBRARIES: + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + +distclean-noinstLTLIBRARIES: + +maintainer-clean-noinstLTLIBRARIES: + +libm.la: $(libm_la_OBJECTS) $(libm_la_DEPENDENCIES) + $(LINK) $(libm_la_LDFLAGS) $(libm_la_OBJECTS) $(libm_la_LIBADD) $(LIBS) + libm.info: libm.texinfo libm.dvi: libm.texinfo @@ -413,7 +461,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -452,7 +500,7 @@ install-am: all-am install: install-recursive uninstall-am: uninstall: uninstall-recursive -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -471,26 +519,31 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ + mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \ mostlyclean-aminfo mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-noinstLIBRARIES clean-compile clean-aminfo clean-tags \ +clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \ + clean-noinstLTLIBRARIES clean-aminfo clean-tags \ clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-libtool distclean-noinstLTLIBRARIES \ distclean-aminfo distclean-tags distclean-generic \ clean-am + -rm -f libtool distclean: distclean-recursive -rm -f config.status maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-aminfo \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-noinstLTLIBRARIES \ + maintainer-clean-aminfo maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -500,7 +553,10 @@ maintainer-clean: maintainer-clean-recursive .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-info-am uninstall-info \ +maintainer-clean-compile mostlyclean-libtool distclean-libtool \ +clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \ +distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \ +maintainer-clean-noinstLTLIBRARIES install-info-am uninstall-info \ mostlyclean-aminfo distclean-aminfo clean-aminfo \ maintainer-clean-aminfo install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ @@ -516,18 +572,17 @@ installdirs-am installdirs mostlyclean-generic distclean-generic \ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean - -libm.a: $(SUBLIBS) - rm -f $@ - rm -rf tmp - mkdir tmp - cd tmp; \ - for i in $(SUBLIBS); do \ - $(AR) x ../$$i; \ - done; \ - $(AR) $(AR_FLAGS) ../$@ *.o - $(RANLIB) $@ - rm -rf tmp +@USE_LIBTOOL_FALSE@libm.a: $(SUBLIBS) +@USE_LIBTOOL_FALSE@ rm -f $@ +@USE_LIBTOOL_FALSE@ rm -rf tmp +@USE_LIBTOOL_FALSE@ mkdir tmp +@USE_LIBTOOL_FALSE@ cd tmp; \ +@USE_LIBTOOL_FALSE@ for i in $(SUBLIBS); do \ +@USE_LIBTOOL_FALSE@ $(AR) x ../$$i; \ +@USE_LIBTOOL_FALSE@ done; \ +@USE_LIBTOOL_FALSE@ $(AR) $(AR_FLAGS) ../$@ *.o +@USE_LIBTOOL_FALSE@ $(RANLIB) $@ +@USE_LIBTOOL_FALSE@ rm -rf tmp $(SUBLIBS): -- cgit v1.2.3