diff options
| author | Mark Wielaard <mark@klomp.org> | 2003-02-01 01:36:17 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2003-02-01 01:36:17 +0000 |
| commit | ccbaec264d2e76bad78518ec8cf473e3fb8e2049 (patch) | |
| tree | 10e2ac770f58bb16aef8b4837584fcce0c27ce9b | |
| parent | 36da0e789c94d96d5c45b63d69fbe1daa0284e00 (diff) | |
| download | gcc-ccbaec264d2e76bad78518ec8cf473e3fb8e2049.zip gcc-ccbaec264d2e76bad78518ec8cf473e3fb8e2049.tar.gz gcc-ccbaec264d2e76bad78518ec8cf473e3fb8e2049.tar.bz2 | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (gtk_c_headers): Strip trailing / from jniinclude.
From-SVN: r62231
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c060e1c..8b181d8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-01-31 Mark WIelaard <mark@klomp.org> + + * Makefile.in: Rebuilt. + * Makefile.am (gtk_c_headers): Strip trailing / from jniinclude. + 2003-01-31 Tom Tromey <tromey@redhat.com> * jni.cc (_Jv_JNI_NewObjectArray): Check that initializer can be diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 92bfc1e..45495f8 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -231,7 +231,7 @@ gtk_c_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sour $(gtk_c_headers): $(gtk_awt_peer_sources) ## FIXME: GNU make. - @input=`echo $@ | sed -e 's,jniinclude,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ + @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input diff --git a/libjava/Makefile.in b/libjava/Makefile.in index d008c47..0ca9cc8 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -2529,7 +2529,7 @@ libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -4534,7 +4534,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean $(gtk_c_headers): $(gtk_awt_peer_sources) - @input=`echo $@ | sed -e 's,jniinclude,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ + @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input |