This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui][patch] fix dynamic-linking build on branch
- From: graydon hoare <graydon at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 24 Jun 2004 13:41:36 -0400
- Subject: [gui][patch] fix dynamic-linking build on branch
hi,
my trunk -> branch merge yesterday broke dynamic linking of the
java-gui-branch tools due to new dependencies on java.util.logging. this
patch, which I've just committed, corrects the bug.
-graydon
2004-06-24 Graydon Hoare <graydon@redhat.com>
* Makefile.am
(jv_convert_LDADD):
(gij_LDADD):
(rmic_LDADD):
(rmiregistry_LDADD): Add lib-java-util-logging.la
* Makefile.in: Regenerate.
--- Makefile.am 24 Jun 2004 05:29:48 -0000 1.361.2.20
+++ Makefile.am 24 Jun 2004 17:39:51 -0000
@@ -804,7 +804,7 @@
## searched before the build-tree ones, and we'd get errors because of
## different libraries with the same SONAME from picky linkers such as
## Solaris'. FIXME: should be _libs on some systems.
-jv_convert_LDADD = -L$(here)/.libs libgcj.la
+jv_convert_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
## 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) \
@@ -817,7 +817,7 @@
gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
gij_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-gij_LDADD = -L$(here)/.libs libgcj.la
+gij_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
gij_DEPENDENCIES = libgcj.la libgcj.spec
@@ -829,7 +829,7 @@
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
rmic_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-rmic_LDADD = -L$(here)/.libs libgcj.la
+rmic_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
rmic_DEPENDENCIES = libgcj.la libgcj.spec
@@ -841,7 +841,7 @@
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
rmiregistry_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-rmiregistry_LDADD = -L$(here)/.libs libgcj.la
+rmiregistry_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
--- Makefile.in 24 Jun 2004 05:29:50 -0000 1.385.2.20
+++ Makefile.in 24 Jun 2004 17:39:51 -0000
@@ -559,7 +559,7 @@
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
jv_convert_LINK = $(GCJLINK)
-jv_convert_LDADD = -L$(here)/.libs libgcj.la
+jv_convert_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
libgcj.la libgcj.spec
@@ -567,7 +567,7 @@
gij_SOURCES = gij.cc
gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
gij_LINK = $(GCJLINK)
-gij_LDADD = -L$(here)/.libs libgcj.la
+gij_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
gij_DEPENDENCIES = libgcj.la libgcj.spec
rmic_SOURCES =
@@ -576,7 +576,7 @@
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
rmic_LINK = $(GCJLINK)
-rmic_LDADD = -L$(here)/.libs libgcj.la
+rmic_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
rmic_DEPENDENCIES = libgcj.la libgcj.spec
rmiregistry_SOURCES =
@@ -585,7 +585,7 @@
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
rmiregistry_LINK = $(GCJLINK)
-rmiregistry_LDADD = -L$(here)/.libs libgcj.la
+rmiregistry_LDADD = -L$(here)/.libs libgcj.la lib-java-util-logging.la
rmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
gen_from_JIS_SOURCES =
@@ -5728,7 +5728,7 @@
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -5748,7 +5748,7 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
@@ -5794,7 +5794,7 @@
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags: