Makefile.am (jv_convert_LDADD): Don't list libraries that are already implicitly brought in from libgcj.la.
* Makefile.am (jv_convert_LDADD): Don't list libraries that are already implicitly brought in from libgcj.la. (gij_LDADD, rmic_LDADD, rmiregistry_LDADD): Likewise. * Makefile.in: Rebuilt. From-SVN: r50853
This commit is contained in:
Alexandre Oliva
Alexandre Oliva
parent
89a1ba6d32
commit
201d203b79
|
|
@ -1,3 +1,10 @@
|
|||
2002-03-15 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* Makefile.am (jv_convert_LDADD): Don't list libraries that are
|
||||
already implicitly brought in from libgcj.la.
|
||||
(gij_LDADD, rmic_LDADD, rmiregistry_LDADD): Likewise.
|
||||
* Makefile.in: Rebuilt.
|
||||
|
||||
2002-03-15 Eric Blake <ebb9@email.byu.edu>
|
||||
|
||||
* THANKS: Fix punctuation, alphabetization.
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ jv_convert_LINK = $(GCJLINK)
|
|||
## system libraries we need (via the specs file).
|
||||
## We need the -L so that gcj can find libgcj with `-lgcj'.
|
||||
## FIXME: should be _libs on some systems.
|
||||
jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
jv_convert_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
|
||||
|
|
@ -446,7 +446,7 @@ gij_LINK = $(GCJLINK)
|
|||
## system libraries we need (via the specs file).
|
||||
## We need the -L so that gcj can find libgcj with `-lgcj'.
|
||||
## FIXME: should be _libs on some systems.
|
||||
gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
gij_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
|
@ -462,7 +462,7 @@ rmic_LINK = $(GCJLINK)
|
|||
## system libraries we need (via the specs file).
|
||||
## We need the -L so that gcj can find libgcj with `-lgcj'.
|
||||
## FIXME: should be _libs on some systems.
|
||||
rmic_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
rmic_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
rmic_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
|
@ -478,7 +478,7 @@ rmiregistry_LINK = $(GCJLINK)
|
|||
## system libraries we need (via the specs file).
|
||||
## We need the -L so that gcj can find libgcj with `-lgcj'.
|
||||
## FIXME: should be _libs on some systems.
|
||||
rmiregistry_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
rmiregistry_LDADD = libgcj.la -L$(here)/.libs
|
||||
## Depend on the spec file to make sure it is up to date before
|
||||
## linking this program.
|
||||
rmiregistry_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -251,7 +251,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
|
|||
-rpath $(toolexeclibdir) -shared-libgcc
|
||||
|
||||
jv_convert_LINK = $(GCJLINK)
|
||||
jv_convert_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
jv_convert_LDADD = libgcj.la -L$(here)/.libs
|
||||
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
|
||||
$(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
||||
|
|
@ -259,7 +259,7 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
|
|||
gij_SOURCES = gij.cc
|
||||
gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc
|
||||
gij_LINK = $(GCJLINK)
|
||||
gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
gij_LDADD = libgcj.la -L$(here)/.libs
|
||||
gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
||||
rmic_SOURCES =
|
||||
|
|
@ -268,7 +268,7 @@ rmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
|
|||
-rpath $(toolexeclibdir) -shared-libgcc
|
||||
|
||||
rmic_LINK = $(GCJLINK)
|
||||
rmic_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
rmic_LDADD = libgcj.la -L$(here)/.libs
|
||||
rmic_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
||||
rmiregistry_SOURCES =
|
||||
|
|
@ -277,7 +277,7 @@ rmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
|
|||
-rpath $(toolexeclibdir) -shared-libgcc
|
||||
|
||||
rmiregistry_LINK = $(GCJLINK)
|
||||
rmiregistry_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
|
||||
rmiregistry_LDADD = libgcj.la -L$(here)/.libs
|
||||
rmiregistry_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
|
||||
|
||||
gen_from_JIS_SOURCES =
|
||||
|
|
@ -1717,8 +1717,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|||
DATA = $(data_DATA) $(toolexeclib_DATA)
|
||||
|
||||
DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \
|
||||
THANKS acinclude.m4 aclocal.m4 configure configure.in \
|
||||
libgcj-test.spec.in libgcj.spec.in
|
||||
THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
|
||||
gcj/libgcj-config.h.in gcj/stamp-h2.in include/config.h.in \
|
||||
include/stamp-h1.in libgcj-test.spec.in libgcj.spec.in
|
||||
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
|
@ -2704,6 +2705,53 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|||
$(SHELL) ./config.status --recheck
|
||||
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
||||
cd $(srcdir) && $(AUTOCONF)
|
||||
|
||||
include/config.h: include/stamp-h1
|
||||
@if test ! -f $@; then \
|
||||
rm -f include/stamp-h1; \
|
||||
$(MAKE) include/stamp-h1; \
|
||||
else :; fi
|
||||
include/stamp-h1: $(srcdir)/include/config.h.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES= CONFIG_HEADERS=include/config.h \
|
||||
$(SHELL) ./config.status
|
||||
@echo timestamp > include/stamp-h1 2> /dev/null
|
||||
$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h1.in
|
||||
@if test ! -f $@; then \
|
||||
rm -f $(srcdir)/include/stamp-h1.in; \
|
||||
$(MAKE) $(srcdir)/include/stamp-h1.in; \
|
||||
else :; fi
|
||||
$(srcdir)/include/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
|
||||
cd $(top_srcdir) && $(AUTOHEADER)
|
||||
@echo timestamp > $(srcdir)/include/stamp-h1.in 2> /dev/null
|
||||
|
||||
gcj/libgcj-config.h: gcj/stamp-h2
|
||||
@if test ! -f $@; then \
|
||||
rm -f gcj/stamp-h2; \
|
||||
$(MAKE) gcj/stamp-h2; \
|
||||
else :; fi
|
||||
gcj/stamp-h2: $(srcdir)/gcj/libgcj-config.h.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES= CONFIG_HEADERS=gcj/libgcj-config.h \
|
||||
$(SHELL) ./config.status
|
||||
@echo timestamp > gcj/stamp-h2 2> /dev/null
|
||||
$(srcdir)/gcj/libgcj-config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/gcj/stamp-h2.in
|
||||
@if test ! -f $@; then \
|
||||
rm -f $(srcdir)/gcj/stamp-h2.in; \
|
||||
$(MAKE) $(srcdir)/gcj/stamp-h2.in; \
|
||||
else :; fi
|
||||
$(srcdir)/gcj/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
|
||||
cd $(top_srcdir) && $(AUTOHEADER)
|
||||
@echo timestamp > $(srcdir)/gcj/stamp-h2.in 2> /dev/null
|
||||
|
||||
mostlyclean-hdr:
|
||||
|
||||
clean-hdr:
|
||||
|
||||
distclean-hdr:
|
||||
-rm -f include/config.h gcj/libgcj-config.h
|
||||
|
||||
maintainer-clean-hdr:
|
||||
libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in
|
||||
|
|
@ -2925,7 +2973,7 @@ maintainer-clean-recursive:
|
|||
dot_seen=no; \
|
||||
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
rev="$$subdir $$rev"; \
|
||||
test "$$subdir" != "." || dot_seen=yes; \
|
||||
test "$$subdir" = "." && dot_seen=yes; \
|
||||
done; \
|
||||
test "$$dot_seen" = "no" && rev=". $$rev"; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
|
|
@ -3138,29 +3186,32 @@ distclean-generic:
|
|||
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
|
||||
|
||||
maintainer-clean-generic:
|
||||
mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
|
||||
mostlyclean-libtool mostlyclean-binPROGRAMS \
|
||||
mostlyclean-noinstPROGRAMS mostlyclean-tags \
|
||||
mostlyclean-depend mostlyclean-generic
|
||||
mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \
|
||||
mostlyclean-compile mostlyclean-libtool \
|
||||
mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
||||
mostlyclean-tags mostlyclean-depend mostlyclean-generic
|
||||
|
||||
mostlyclean: mostlyclean-recursive
|
||||
|
||||
clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
|
||||
clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
|
||||
clean-depend clean-generic mostlyclean-am clean-local
|
||||
clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \
|
||||
clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \
|
||||
clean-tags clean-depend clean-generic mostlyclean-am \
|
||||
clean-local
|
||||
|
||||
clean: clean-recursive
|
||||
|
||||
distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
|
||||
distclean-libtool distclean-binPROGRAMS \
|
||||
distclean-noinstPROGRAMS distclean-tags \
|
||||
distclean-depend distclean-generic clean-am
|
||||
distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \
|
||||
distclean-compile distclean-libtool \
|
||||
distclean-binPROGRAMS distclean-noinstPROGRAMS \
|
||||
distclean-tags distclean-depend distclean-generic \
|
||||
clean-am
|
||||
-rm -f libtool
|
||||
|
||||
distclean: distclean-recursive
|
||||
-rm -f config.status
|
||||
|
||||
maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-am: maintainer-clean-hdr \
|
||||
maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-compile maintainer-clean-libtool \
|
||||
maintainer-clean-binPROGRAMS \
|
||||
maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
|
||||
|
|
@ -3172,9 +3223,9 @@ maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
|
|||
maintainer-clean: maintainer-clean-recursive
|
||||
-rm -f config.status
|
||||
|
||||
.PHONY: mostlyclean-toolexeclibLTLIBRARIES \
|
||||
distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
|
||||
mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \
|
||||
clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
||||
|
|
|
|||
Loading…
Reference in New Issue