* libm/machine/Makefile.am: Change rules to create correct lib.a.
* libm/machine/Makefile.in: Regenerated through automake.
This commit is contained in:
parent
aa053fd461
commit
13b918be74
@ -1,3 +1,8 @@
|
|||||||
|
2001-12-19 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* libm/machine/Makefile.am: Change rules to create correct lib.a.
|
||||||
|
* libm/machine/Makefile.in: Regenerated through automake.
|
||||||
|
|
||||||
2001-12-18 Thomas Fitzsimmons <fitzsim@redhat.com>
|
2001-12-18 Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||||
|
|
||||||
* Makefile.am (DOCDIR): Force to empty string when doc
|
* Makefile.am (DOCDIR): Force to empty string when doc
|
||||||
|
@ -7,11 +7,16 @@ SUBDIRS = $(libm_machine_dir) .
|
|||||||
if USE_LIBTOOL
|
if USE_LIBTOOL
|
||||||
else
|
else
|
||||||
noinst_LIBRARIES = lib.a
|
noinst_LIBRARIES = lib.a
|
||||||
lib_a_SOURCES =
|
|
||||||
lib_a_LIBADD = $(machlib)
|
lib.a: $(libm_machine_dir)/lib.a
|
||||||
|
rm -f $@
|
||||||
|
ln $(libm_machine_dir)/lib.a $@ >/dev/null 2>/dev/null || \
|
||||||
|
cp $(libm_machine_dir)/lib.a $@
|
||||||
endif # USE_LIBTOOL
|
endif # USE_LIBTOOL
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I ../..
|
ACLOCAL_AMFLAGS = -I ../..
|
||||||
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
|
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
|
||||||
|
|
||||||
|
$(libm_machine_dir)/lib.a:
|
||||||
|
|
||||||
doc:
|
doc:
|
||||||
|
@ -87,9 +87,7 @@ AUTOMAKE_OPTIONS = cygnus
|
|||||||
|
|
||||||
SUBDIRS = $(libm_machine_dir) .
|
SUBDIRS = $(libm_machine_dir) .
|
||||||
|
|
||||||
@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
|
@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
|
||||||
@USE_LIBTOOL_FALSE@lib_a_SOURCES =
|
|
||||||
@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(machlib)
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I ../..
|
ACLOCAL_AMFLAGS = -I ../..
|
||||||
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
|
CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
|
||||||
@ -102,8 +100,14 @@ LIBRARIES = $(noinst_LIBRARIES)
|
|||||||
DEFS = @DEFS@ -I. -I$(srcdir)
|
DEFS = @DEFS@ -I. -I$(srcdir)
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES =
|
lib_a_LIBADD =
|
||||||
@USE_LIBTOOL_FALSE@lib_a_OBJECTS =
|
lib_a_SOURCES = lib.a.c
|
||||||
|
lib_a_OBJECTS = lib.a.o
|
||||||
|
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 = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||||
DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in
|
DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in
|
||||||
|
|
||||||
|
|
||||||
@ -111,8 +115,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|||||||
|
|
||||||
TAR = gtar
|
TAR = gtar
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
SOURCES = $(lib_a_SOURCES)
|
SOURCES = lib.a.c
|
||||||
OBJECTS = $(lib_a_OBJECTS)
|
OBJECTS = lib.a.o
|
||||||
|
|
||||||
all: all-redirect
|
all: all-redirect
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
@ -180,11 +184,6 @@ distclean-libtool:
|
|||||||
|
|
||||||
maintainer-clean-libtool:
|
maintainer-clean-libtool:
|
||||||
|
|
||||||
lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
|
|
||||||
-rm -f lib.a
|
|
||||||
$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
|
|
||||||
$(RANLIB) lib.a
|
|
||||||
|
|
||||||
# This directory's subdirectories are mostly independent; you can cd
|
# This directory's subdirectories are mostly independent; you can cd
|
||||||
# into them and run `make' without going through this Makefile.
|
# into them and run `make' without going through this Makefile.
|
||||||
# To change the values of `make' variables: instead of editing Makefiles,
|
# To change the values of `make' variables: instead of editing Makefiles,
|
||||||
@ -418,6 +417,13 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
|
|||||||
maintainer-clean
|
maintainer-clean
|
||||||
|
|
||||||
|
|
||||||
|
@USE_LIBTOOL_FALSE@lib.a: $(libm_machine_dir)/lib.a
|
||||||
|
@USE_LIBTOOL_FALSE@ rm -f $@
|
||||||
|
@USE_LIBTOOL_FALSE@ ln $(libm_machine_dir)/lib.a $@ >/dev/null 2>/dev/null || \
|
||||||
|
@USE_LIBTOOL_FALSE@ cp $(libm_machine_dir)/lib.a $@
|
||||||
|
|
||||||
|
$(libm_machine_dir)/lib.a:
|
||||||
|
|
||||||
doc:
|
doc:
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user