Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.42
diff -u -r1.42 Makefile.am
--- include/Makefile.am	16 Apr 2005 11:05:07 -0000	1.42
+++ include/Makefile.am	17 Apr 2005 01:09:18 -0000
@@ -72,6 +72,8 @@
 $(top_srcdir)/include/gnu_java_nio_VMPipe.h \
 $(top_srcdir)/include/gnu_java_nio_VMSelector.h \
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
+$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvEncoder.h \
+$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvDecoder.h \
 $(top_srcdir)/include/java_io_VMFile.h \
 $(top_srcdir)/include/java_io_VMObjectInputStream.h \
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h \
@@ -139,6 +141,10 @@
 	$(JAVAH) -o $@ java.nio.MappedByteBufferImpl
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl
+$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvDecoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvDecoder.java
+	$(JAVAH) -o $@ gnu.java.nio.charset.iconv.IconvDecoder
+$(top_srcdir)/include/gnu_java_nio_charset_iconv_IconvEncoder.h: $(top_srcdir)/gnu/java/nio/charset/iconv/IconvEncoder.java
+	$(JAVAH) -o $@ gnu.java.nio.charset.iconv.IconvEncoder
 $(top_srcdir)/include/java_util_VMTimeZone.h: $(top_srcdir)/vm/reference/java/util/VMTimeZone.java
 	$(JAVAH) -o $@ java.util.VMTimeZone
 
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- native/jni/java-nio/Makefile.am	12 Jan 2005 10:08:13 -0000	1.16
+++ native/jni/java-nio/Makefile.am	17 Apr 2005 01:09:18 -0000
@@ -3,6 +3,8 @@
 libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
 			gnu_java_nio_VMSelector.c \
 			gnu_java_nio_channels_FileChannelImpl.c \
+			gnu_java_nio_charset_iconv_IconvDecoder.c \
+			gnu_java_nio_charset_iconv_IconvEncoder.c \
 			java_nio_MappedByteBufferImpl.c \
 			java_nio_VMDirectByteBuffer.c