diff options
| author | Mark Wielaard <mark@klomp.org> | 2005-01-02 15:06:24 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2005-01-02 15:06:24 +0000 |
| commit | 28e34058e1d12b7f5fc36dd416f420e25bafeae4 (patch) | |
| tree | 80d44c0c50b5616ece3dcb14483554339a25b5b4 /lib | |
| parent | fbd9c799f37db02901ef71225f2c6955a27e2226 (diff) | |
| download | classpath-28e34058e1d12b7f5fc36dd416f420e25bafeae4.tar.gz | |
* lib/gen-classlist.sh.in: Use test -ef and echo top_srcdir and
top_builddir locations.
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/gen-classlist.sh.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index 584565e47..ce2bb5830 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -1,9 +1,17 @@ #! @SH@ # @configure_input@ -if test "@top_srcdir@" = "${top_builddir}"; then - @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 -else - @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/java @top_srcdir@/vm/reference @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + +echo "Adding java source files from srcdir '@top_srcdir@'." +@FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu \ + @top_srcdir@/org @top_srcdir@/vm/reference \ + @top_srcdir@/external/w3c_dom @top_srcdir@/external/sax \ + -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + +# Only include generated files once. +if test ! "${top_builddir}" -ef "@top_srcdir@"; then + echo "Adding generated files in builddir '${top_builddir}'." + @FIND@ ${top_builddir}/gnu ${top_builddir}/java -follow -type f -print \ + | grep '\.java$' >> ${top_builddir}/lib/classes.1 fi for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done |