From 25d080049e3809ad7de5583001b17b8926022902 Mon Sep 17 00:00:00 2001 From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Fri, 6 Jan 2006 20:12:22 +0000 Subject: [PATCH] PR libgcj/23499: * lib/Makefile.in: Rebuilt. * lib/Makefile.am (glibj_DATA): Commented out. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109426 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/ChangeLog.gcj | 6 ++++ libjava/classpath/lib/Makefile.am | 4 ++- libjava/classpath/lib/Makefile.in | 48 ++++++------------------------- 3 files changed, 18 insertions(+), 40 deletions(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index a0a05ece3dc0..0d04bba937a7 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,9 @@ +2006-01-06 Tom Tromey <tromey@redhat.com> + + PR libgcj/23499: + * lib/Makefile.in: Rebuilt. + * lib/Makefile.am (glibj_DATA): Commented out. + 2005-12-01 Anthony Green <green@redhat.com> PR bootstrap/25207 diff --git a/libjava/classpath/lib/Makefile.am b/libjava/classpath/lib/Makefile.am index 5a54a4d698a1..1c215d187f21 100644 --- a/libjava/classpath/lib/Makefile.am +++ b/libjava/classpath/lib/Makefile.am @@ -40,7 +40,9 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB) if INSTALL_GLIBJ_ZIP -glibj_DATA = glibj.zip +## GCJ LOCAL: Comment this out so we don't make an empty +## '$(glibjdir)' in the install tree. +## glibj_DATA = glibj.zip endif # INSTALL_GLIBJ_ZIP diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 394af457db34..8817563b5eb9 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -54,15 +54,7 @@ CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = gen-classlist.sh copy-vmresources.sh SOURCES = DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(glibjdir)" -glibjDATA_INSTALL = $(INSTALL_DATA) -DATA = $(glibj_DATA) $(noinst_DATA) +DATA = $(noinst_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -269,7 +261,6 @@ compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$ # handling source to bytecode compiler programs like gcj, jikes and kjc @FOUND_GCJ_TRUE@JAVAC = exit 1 JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB) -@INSTALL_GLIBJ_ZIP_TRUE@glibj_DATA = glibj.zip @BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ @@ -323,23 +314,6 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-glibjDATA: $(glibj_DATA) - @$(NORMAL_INSTALL) - test -z "$(glibjdir)" || $(mkdir_p) "$(DESTDIR)$(glibjdir)" - @list='$(glibj_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(glibjDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glibjdir)/$$f'"; \ - $(glibjDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glibjdir)/$$f"; \ - done - -uninstall-glibjDATA: - @$(NORMAL_UNINSTALL) - @list='$(glibj_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(glibjdir)/$$f'"; \ - rm -f "$(DESTDIR)$(glibjdir)/$$f"; \ - done tags: TAGS TAGS: @@ -381,9 +355,6 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(glibjdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -429,7 +400,7 @@ info: info-am info-am: -install-data-am: install-data-local install-glibjDATA +install-data-am: install-data-local install-exec-am: @@ -455,19 +426,18 @@ ps: ps-am ps-am: -uninstall-am: uninstall-glibjDATA uninstall-info-am uninstall-local +uninstall-am: uninstall-info-am uninstall-local .PHONY: all all-am check check-am clean clean-generic clean-libtool \ clean-local dist-hook distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am \ - install-glibjDATA install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-glibjDATA uninstall-info-am \ - uninstall-local + install-data-local install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-local sinclude $(JAVA_DEPEND) -- GitLab