This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: Generate and install headers for some inner classes
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 25 Feb 2004 20:58:14 +0100
- Subject: Patch: Generate and install headers for some inner classes
Hi list
I wrote a little patch to generate and install headers for inner
classes.
Okay to commit to trunk ?
Michael
2004-02-25 Michael Koch <konqueror@gmx.de>
* Makefile.am: Generate and install headers for inner classes in
java.nio.channels.Pipe and gnu.java.nio.PipeImpl.
* Makefile.in: Regenerated.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.361
diff -u -b -B -r1.361 Makefile.am
--- Makefile.am 12 Feb 2004 07:10:06 -0000 1.361
+++ Makefile.am 25 Feb 2004 19:51:12 -0000
@@ -511,10 +511,14 @@
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 @@
$(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 @@
$(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 @@
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/
## ################################################################
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.385
diff -u -b -B -r1.385 Makefile.in
--- Makefile.in 12 Feb 2004 07:10:06 -0000 1.385
+++ Makefile.in 25 Feb 2004 19:51:14 -0000
@@ -478,10 +478,14 @@
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 @@
$(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 @@
$(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 @@
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 ' \