procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.

Browse source 
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.

From-SVN: r132156
This commit is contained in:
Matthias Klose 2008-02-06 19:22:53 +00:00 • committed by Matthias Klose
parent e630b7a6a1
commit fb208bed52
3 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/classpath/tools/Makefile.am
View file

@ -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

25
libjava/classpath/tools/Makefile.in
View file

@ -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; \