Makefile.am (nat_headers_install): New variable with header files to install automati...

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.

From-SVN: r74475

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e5d944dabc4a55c18619d85054a728d424b9d8f0..fa81c2a0ce63cda84c56e2341d995ebbbbc5c8d7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2003-12-09  Michael Koch  <konqueror@gmx.de>
 
        * java/util/Calendar.java,

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 355527bc842eaad9b1d0f248db80935b9f2bd716..23dd92c80a7b0949cb26203e5598afedcf2ae4f3 100644 (file)
--- 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
 
 ## ################################################################

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index a0e1f9e859e72faab63348ea1eabe3a4fc087049..f33cecfb4ff1aacb8176b38a490ff77683484382 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -455,6 +455,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
 
 
 nat_headers = $(ordinary_nat_headers) $(inner_nat_headers)
+nat_headers_install = $(ordinary_nat_headers)
 
 x_nat_headers = $(x_java_source_files:.java=.h)
 
@@ -2755,7 +2756,7 @@ libgcj-test.spec.in libgcj.pc.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 \
@@ -5123,7 +5124,7 @@ $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
 install-data-local:
        $(PRE_INSTALL)
        @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; \
@@ -5137,6 +5138,13 @@ 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) '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
 
 maintainer-check: libgcj.la