diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-27 00:18:36 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-27 00:18:36 +0000 |
| commit | d6e4f9fb2457086bac87975672c0c11f2d88f67f (patch) | |
| tree | 3aa87b047cd3ff8fb7e79056d5c3c220486acde3 /tools | |
| parent | 1b56c841903c989e75d6878c07524b7970fba65c (diff) | |
| download | classpath-d6e4f9fb2457086bac87975672c0c11f2d88f67f.tar.gz | |
Generalise --with-fastjar to --with-jar and allow it to be turned off.
2008-06-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/36637:
* examples/Makefile.am,
* lib/Makefile.am:
Use new conditional and $(JAR).
* m4/acinclude.m4:
Replace --with-fastjar with a general
--with-jar check that can be turned off.
* tools/Makefile.am:
Use new conditional and $(JAR).
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 1a86ce95c..0d57f50c3 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -343,15 +343,22 @@ if CREATE_GJDOC cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res; \ done endif + +if WITH_JAR +CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) . +UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) . +else +CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) . +UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) . +endif + ## First add classpath tools stuff. (cd classes; \ - if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then "$(FASTJAR)" cf ../$(TOOLS_ZIP) .; fi; \ + $(CREATE_TOOLS_ZIP); \ cd ..) ## Now add ASM classes. (cd asm; \ - if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then "$(FASTJAR)" uf ../$(TOOLS_ZIP) .; fi; \ + $(UPDATE_TOOLS_ZIP); \ cd ..) rm -rf classes |