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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index a5ad99921..409269b2e 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -84,6 +84,13 @@ dist-hook: # To generate the example zip just depend on the sources and ignore the # class files. Always regenerate all .class files and remove them immediatly. # And copy the png icons we use to the classes dir so they get also included. + +if WITH_JAR +CREATE_EXAMPLE_ZIP=$(JAR) cf ../$(EXAMPLE_ZIP) . +else +CREATE_EXAMPLE_ZIP=$(ZIP) -r ../$(EXAMPLE_ZIP) . +endif + $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) @mkdir_p@ classes/gnu/classpath/examples/icons cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons @@ -91,8 +98,7 @@ $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES) (cd classes; \ - if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi; \ + $(CREATE_EXAMPLE_ZIP); \ cd ..) rm -rf classes |