2008-02-06 Matthias Klose <doko@ubuntu.com>

        * tools/Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.
        Copy resource files independent of JAVA_MAINTAINER_MODE.
        * tools/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132156 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 6ee69e1..7d3eb99 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2008-02-06  Matthias Klose  <doko@ubuntu.com>
+
+       * tools/Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.
+       Copy resource files independent of JAVA_MAINTAINER_MODE.
+       * tools/Makefile.in: Regenerate.
+
 2008-01-28  Tom Tromey  <tromey@redhat.com>
 
        * tools/classes/gnu/classpath/tools/native2ascii/Native2ASCII$3.class:

diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index 2ab6502..22a6e38 100755 (executable)
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -186,6 +186,7 @@ if JAVA_MAINTAINER_MODE
        AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
          $$AC -g -w -d $(srcdir)/asm @asm.lst
        $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst
+endif
 ## Copy over tools resource files.
        @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
               com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
@@ -196,7 +197,14 @@ if JAVA_MAINTAINER_MODE
          echo "  cp $(top_srcdir)/resource/$$p classes/$$p"; \
          cp $(top_srcdir)/resource/$$p classes/$$p; \
        done
-endif
+## Copy over rmic template files.
+       @list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \
+       for p in $$list; do \
+         dirname=classes/`dirname $$p`; \
+         if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+         echo "  cp $(srcdir)/$$p classes/$$p"; \
+         cp $(srcdir)/$$p classes/$$p; \
+       done
        cp -pR $(srcdir)/asm .
        cp -pR $(srcdir)/classes .
 ## END GCJ LOCAL

diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index 2d730aa..a2d2ed7 100644 (file)
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -1132,15 +1132,22 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
 @JAVA_MAINTAINER_MODE_TRUE@    AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
 @JAVA_MAINTAINER_MODE_TRUE@      $$AC -g -w -d $(srcdir)/asm @asm.lst
 @JAVA_MAINTAINER_MODE_TRUE@    $(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst
-@JAVA_MAINTAINER_MODE_TRUE@    @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
-@JAVA_MAINTAINER_MODE_TRUE@           com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
-@JAVA_MAINTAINER_MODE_TRUE@           sun/rmi/rmic -name \*.properties -print`; \
-@JAVA_MAINTAINER_MODE_TRUE@    for p in $$list; do \
-@JAVA_MAINTAINER_MODE_TRUE@      dirname=classes/`dirname $$p`; \
-@JAVA_MAINTAINER_MODE_TRUE@      if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
-@JAVA_MAINTAINER_MODE_TRUE@      echo "  cp $(top_srcdir)/resource/$$p classes/$$p"; \
-@JAVA_MAINTAINER_MODE_TRUE@      cp $(top_srcdir)/resource/$$p classes/$$p; \
-@JAVA_MAINTAINER_MODE_TRUE@    done
+       @list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
+              com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
+              sun/rmi/rmic -name \*.properties -print`; \
+       for p in $$list; do \
+         dirname=classes/`dirname $$p`; \
+         if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+         echo "  cp $(top_srcdir)/resource/$$p classes/$$p"; \
+         cp $(top_srcdir)/resource/$$p classes/$$p; \
+       done
+       @list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \
+       for p in $$list; do \
+         dirname=classes/`dirname $$p`; \
+         if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+         echo "  cp $(srcdir)/$$p classes/$$p"; \
+         cp $(srcdir)/$$p classes/$$p; \
+       done
        cp -pR $(srcdir)/asm .
        cp -pR $(srcdir)/classes .
        (cd classes; \