From: Michael Koch Date: Thu, 26 Feb 2004 10:04:39 +0000 (+0000) Subject: Makefile.am: Generate and install headers for inner classes in java.nio.channels... X-Git-Tag: releases/gcc-4.0.0~9836 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e2a4850db7dcb27d4fed3d486a329650cb0dbd1;p=thirdparty%2Fgcc.git Makefile.am: Generate and install headers for inner classes in java.nio.channels.Pipe and... 2004-02-26 Michael Koch * Makefile.am: Generate and install headers for inner classes in java.nio.channels.Pipe and gnu.java.nio.PipeImpl. * Makefile.in: Regenerated. From-SVN: r78493 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d5f171d147b4..6042fb96d397 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-02-26 Michael Koch + + * Makefile.am: Generate and install headers for inner classes in + java.nio.channels.Pipe and gnu.java.nio.PipeImpl. + * Makefile.in: Regenerated. 2004-02-24 Anthony Green * java/lang/StringBuffer.java: No need to NULL out remainder of diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 5637e14db626..302bb48cff44 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -511,10 +511,14 @@ ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ + java/nio/channels/Pipe$$SinkChannel.h \ + java/nio/channels/Pipe$$SourceChannel.h \ java/lang/reflect/Proxy$$ProxyData.h \ java/lang/reflect/Proxy$$ProxyType.h \ gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ - gnu/java/net/PlainSocketImpl$$SocketOutputStream.h + gnu/java/net/PlainSocketImpl$$SocketOutputStream.h \ + gnu/java/nio/PipeImpl$$SinkChannelImpl.h \ + gnu/java/nio/PipeImpl$$SourceChannelImpl.h nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers_install = $(ordinary_nat_headers) @@ -600,6 +604,14 @@ java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' +java/nio/channels/Pipe$$SinkChannel.h: java/nio/channels/Pipe.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/channels/Pipe$$SinkChannel' + +java/nio/channels/Pipe$$SourceChannel.h: java/nio/channels/Pipe.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/channels/Pipe$$SourceChannel' + gnu/java/net/PlainSocketImpl$$SocketInputStream.h: gnu/java/net/PlainSocketImpl.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'gnu/java/net/PlainSocketImpl$$SocketInputStream' @@ -608,6 +620,14 @@ gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: gnu/java/net/PlainSocketImpl $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'gnu/java/net/PlainSocketImpl$$SocketOutputStream' +gnu/java/nio/PipeImpl$$SinkChannelImpl.h: gnu/java/nio/PipeImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/nio/PipeImpl$$SinkChannelImpl' + +gnu/java/nio/PipeImpl$$SourceChannelImpl.h: gnu/java/nio/PipeImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/nio/PipeImpl$$SourceChannelImpl' + ## Headers we maintain by hand and which we want to install. extra_headers = java/lang/Object.h java/lang/Class.h @@ -637,14 +657,18 @@ install-data-local: echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \ $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \ done + $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties ## Install inner class headers. $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(includedir)/java/io/ $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(includedir)/java/io/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/ $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(includedir)/java/lang/reflect/ $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(includedir)/java/lang/reflect/ $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ - $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/ + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/ ## ################################################################ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 324f32be91fa..ec1248f4e691 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -478,10 +478,14 @@ ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ + java/nio/channels/Pipe$$SinkChannel.h \ + java/nio/channels/Pipe$$SourceChannel.h \ java/lang/reflect/Proxy$$ProxyData.h \ java/lang/reflect/Proxy$$ProxyType.h \ gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ - gnu/java/net/PlainSocketImpl$$SocketOutputStream.h + gnu/java/net/PlainSocketImpl$$SocketOutputStream.h \ + gnu/java/nio/PipeImpl$$SinkChannelImpl.h \ + gnu/java/nio/PipeImpl$$SourceChannelImpl.h nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) @@ -5364,6 +5368,14 @@ java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' +java/nio/channels/Pipe$$SinkChannel.h: java/nio/channels/Pipe.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/channels/Pipe$$SinkChannel' + +java/nio/channels/Pipe$$SourceChannel.h: java/nio/channels/Pipe.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'java/nio/channels/Pipe$$SourceChannel' + gnu/java/net/PlainSocketImpl$$SocketInputStream.h: gnu/java/net/PlainSocketImpl.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'gnu/java/net/PlainSocketImpl$$SocketInputStream' @@ -5372,6 +5384,14 @@ gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: gnu/java/net/PlainSocketImpl $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'gnu/java/net/PlainSocketImpl$$SocketOutputStream' +gnu/java/nio/PipeImpl$$SinkChannelImpl.h: gnu/java/nio/PipeImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/nio/PipeImpl$$SinkChannelImpl' + +gnu/java/nio/PipeImpl$$SourceChannelImpl.h: gnu/java/nio/PipeImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/nio/PipeImpl$$SourceChannelImpl' + $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: @@ -5392,13 +5412,17 @@ install-data-local: echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \ $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \ done + $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties $(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(includedir)/java/io/ $(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(includedir)/java/io/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/ + $(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/ $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(includedir)/java/lang/reflect/ $(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(includedir)/java/lang/reflect/ $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ $(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/ - $(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/ + $(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/ maintainer-check: libgcj.la $(NM) .libs/libgcj.a | grep ' T ' \