From ccbaec264d2e76bad78518ec8cf473e3fb8e2049 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sat, 1 Feb 2003 01:36:17 +0000 Subject: [PATCH] Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (gtk_c_headers): Strip trailing / from jniinclude. From-SVN: r62231 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c060e1c2604..8b181d89f45 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-01-31 Mark WIelaard + + * Makefile.in: Rebuilt. + * Makefile.am (gtk_c_headers): Strip trailing / from jniinclude. + 2003-01-31 Tom Tromey * jni.cc (_Jv_JNI_NewObjectArray): Check that initializer can be diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 92bfc1e09d5..45495f8dafb 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 d008c471faa..0ca9cc8cae2 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