diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-09 18:45:09 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-09 18:45:09 +0000 |
| commit | 913f3d59ec972e7369887eef4e196cb5cefa2e2c (patch) | |
| tree | a49a4c079e736b5cb8f9608a9a1597275cbcb0cd /libjava/Makefile.am | |
| parent | 2fab99a6944cbacb9230e190d766a28414283455 (diff) | |
| download | ppe42-gcc-913f3d59ec972e7369887eef4e196cb5cefa2e2c.tar.gz ppe42-gcc-913f3d59ec972e7369887eef4e196cb5cefa2e2c.zip | |
2003-12-09 Michael Koch <konqueror@gmx.de>
* Makefile.am (nat_headers_install): New variable with header files to
install automatically.
(install-data-local): Install all headers listed in
nat_headers_install. Install innert nat headers explicitely.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74475 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 355527bc842..23dd92c80a7 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -477,6 +477,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ gnu/java/net/PlainSocketImpl$$SocketOutputStream.h nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) +nat_headers_install = $(ordinary_nat_headers) x_nat_headers = $(x_java_source_files:.java=.h) @@ -580,7 +581,7 @@ install-data-local: ## We use a GNU make trick here so that we don't go over the command ## length limit of some shells. @echo Creating list of headers to install... - @: $(call write_entries_to_file,$(nat_headers) $(extra_headers),tmp-ilist) + @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist) @cat tmp-ilist | while read f; do \ d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \ $(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \ @@ -596,6 +597,14 @@ install-data-local: echo " $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f"; \ $(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \ done +## 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/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 ## ################################################################ |
