diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-03 23:58:09 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-03 23:58:09 +0000 |
| commit | 1df2b8f4bfd3c8fa6486aca14f9f76337ea6d8a5 (patch) | |
| tree | 668064d847a2e0483460c671fa9c2e47e7957aa7 /libjava | |
| parent | ced7c954a605dace22f91a3eb51e438e40473fe9 (diff) | |
| download | gcc-1df2b8f4bfd3c8fa6486aca14f9f76337ea6d8a5.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110570 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 26 | ||||
| -rw-r--r-- | libjava/Makefile.in | 25 |
3 files changed, 51 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aac072bcb71..bdb0a89adab 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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> * link.cc: diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 9ec3a549ccc..4f663a0c9c5 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -864,20 +864,40 @@ gnu/gcj/xlib/natXUnmapEvent.cc src.zip: -rm -f src.zip here=`pwd`; \ - ( ( cd $(srcdir); \ + ( \ + ( cd $(srcdir)/classpath; \ find java gnu javax org -name '*.java' -print | \ while read file; do \ ## Ugly code to avoid "echo -C". Must separate each entry by a newline ## Gross but easy. echo "x-C" | sed -e 's/^.//'; \ - echo $(srcdir); \ + echo $(srcdir)/classpath; \ echo $$file; \ done ); \ ## 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 ## be a relative path to fastjar. $(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. sourcesdir = $(jardir) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 118b4925181..af11934ec76 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -9465,15 +9465,34 @@ write-entries-to-file-check: src.zip: -rm -f src.zip here=`pwd`; \ - ( ( cd $(srcdir); \ + ( \ + ( cd $(srcdir)/classpath; \ find java gnu javax org -name '*.java' -print | \ while read file; do \ echo "x-C" | sed -e 's/^.//'; \ - echo $(srcdir); \ + echo $(srcdir)/classpath; \ echo $$file; \ done ); \ - 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 ); \ + ) | \ $(ZIP) -cfM@ $$here/src.zip + 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 install-src.zip: src.zip $(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip |