mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-24 19:33:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile.am (src.zip): Update src.zip file search to look in classpath directory.

Browse Source 
2006-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (src.zip): Update src.zip file search to look in
	classpath directory.
	* Makefile.in: Regenerate.

From-SVN: r110570
This commit is contained in:
Thomas Fitzsimmons 2006-02-03 23:58:09 +00:00 committed by Thomas Fitzsimmons
parent b323323f9b
commit 510a8dd51d
3 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2006-02-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (src.zip): Update src.zip file search to look in
classpath directory.
* Makefile.in: Regenerate.
2006-02-03 Robert Schuster <robertschuster@fsfe.org> 2006-02-03 Robert Schuster <robertschuster@fsfe.org>
* link.cc: * link.cc:

26
libjava/Makefile.am
View File

@ -864,20 +864,40 @@ gnu/gcj/xlib/natXUnmapEvent.cc
src.zip: src.zip:
-rm -f src.zip -rm -f src.zip
here=`pwd`; \ here=`pwd`; \
( ( cd $(srcdir); \ ( \
( cd $(srcdir)/classpath; \
find java gnu javax org -name '*.java' -print | \ find java gnu javax org -name '*.java' -print | \
while read file; do \ while read file; do \
## Ugly code to avoid "echo -C". Must separate each entry by a newline ## Ugly code to avoid "echo -C". Must separate each entry by a newline
## Gross but easy. ## Gross but easy.
echo "x-C" | sed -e 's/^.//'; \ echo "x-C" | sed -e 's/^.//'; \
echo $(srcdir); \ echo $(srcdir)/classpath; \
echo $$file; \ echo $$file; \
done ); \ done ); \
## Now the build tree. ## Now the build tree.
find gnu java -name '*.java' -print) | \ ( cd classpath; \
find gnu java -name '*.java' -print | \
while read file; do \
echo "x-C" | sed -e 's/^.//'; \
echo `pwd`; \
echo $$file; \
done ); \
) | \
## Many of the above circumlocutions are because ZIP will most likely ## Many of the above circumlocutions are because ZIP will most likely
## be a relative path to fastjar. ## be a relative path to fastjar.
$(ZIP) -cfM@ $$here/src.zip $(ZIP) -cfM@ $$here/src.zip
## Override GNU Classpath sources with libgcj replacements.
here=`pwd`; \
( \
( cd $(srcdir); \
find gnu java -name '*.java' -print | \
while read file; do \
echo "x-C" | sed -e 's/^.//'; \
echo $(srcdir); \
echo $$file; \
done ); \
) | \
$(ZIP) -ufM@ $$here/src.zip
## We use a variable for this in case the user wants to override it. ## We use a variable for this in case the user wants to override it.
sourcesdir = $(jardir) sourcesdir = $(jardir)

25
libjava/Makefile.in
View File

@ -9465,15 +9465,34 @@ write-entries-to-file-check:
src.zip: src.zip:
-rm -f src.zip -rm -f src.zip
here=`pwd`; \ here=`pwd`; \
( ( cd $(srcdir); \ ( \
( cd $(srcdir)/classpath; \
find java gnu javax org -name '*.java' -print | \ find java gnu javax org -name '*.java' -print | \
while read file; do \
echo "x-C" | sed -e 's/^.//'; \
echo $(srcdir)/classpath; \
echo $$file; \
done ); \
( cd classpath; \
find gnu java -name '*.java' -print | \
while read file; do \
echo "x-C" | sed -e 's/^.//'; \
echo `pwd`; \
echo $$file; \
done ); \
) | \
$(ZIP) -cfM@ $$here/src.zip
here=`pwd`; \
( \
( cd $(srcdir); \
find gnu java -name '*.java' -print | \
while read file; do \ while read file; do \
echo "x-C" | sed -e 's/^.//'; \ echo "x-C" | sed -e 's/^.//'; \
echo $(srcdir); \ echo $(srcdir); \
echo $$file; \ echo $$file; \
done ); \ done ); \
find gnu java -name '*.java' -print) | \ ) | \
$(ZIP) -cfM@ $$here/src.zip $(ZIP) -ufM@ $$here/src.zip
install-src.zip: src.zip install-src.zip: src.zip
$(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip $(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip