diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-01-27 00:22:35 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-01-27 00:22:35 +0100 |
| commit | d4da97d78e4f63c4e1e2f7d0bbc6399acb819168 (patch) | |
| tree | b33b14c90ffeb78225b4d6cb99e94c9c94768ca8 /libjava/Makefile.am | |
| parent | e2e302361205f6e879dbf07bb32fc8e8675763fb (diff) | |
| download | gcc-d4da97d78e4f63c4e1e2f7d0bbc6399acb819168.zip gcc-d4da97d78e4f63c4e1e2f7d0bbc6399acb819168.tar.gz gcc-d4da97d78e4f63c4e1e2f7d0bbc6399acb819168.tar.bz2 | |
Makefile.am (generic_header_files): Add $(inner_nat_headers).
* Makefile.am (generic_header_files): Add $(inner_nat_headers).
* testsuite/Makefile.am (check-dejaGNU): Depend on compile-tests.
(MYGCJH): New variable.
(compile-tests): New goal.
* Makefile.in: Rebuilt.
* testsuite/Makefile.in: Rebuilt.
From-SVN: r121217
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ba89341..90e6afb 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -394,19 +394,6 @@ omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \ java/lang/reflect/Field.h java/lang/reflect/Method.h \ java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h -generic_header_files = $(ordinary_header_files) $(xlib_nat_headers) - -MYGCJH = gjavah - -$(generic_header_files): gcjh.stamp - -gcjh.stamp: classpath/lib/compile-classes -if JAVA_MAINTAINER_MODE - $(MYGCJH) --cni --all $(srcdir)/classpath/lib \ - --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force -endif - echo > gcjh.stamp - inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ java/nio/DirectByteBufferImpl$$ReadWrite.h \ @@ -419,6 +406,20 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ gnu/java/nio/PipeImpl$$SinkChannelImpl.h \ gnu/java/nio/PipeImpl$$SourceChannelImpl.h +generic_header_files = $(ordinary_header_files) $(inner_nat_headers) \ + $(xlib_nat_headers) + +MYGCJH = gjavah + +$(generic_header_files): gcjh.stamp + +gcjh.stamp: classpath/lib/compile-classes +if JAVA_MAINTAINER_MODE + $(MYGCJH) --cni --all $(srcdir)/classpath/lib \ + --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force +endif + echo > gcjh.stamp + nat_headers = $(ordinary_header_files) $(inner_nat_headers) nat_headers_install = $(ordinary_header_files) |