diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /jtools/Makefile | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'jtools/Makefile')
| -rw-r--r-- | jtools/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jtools/Makefile b/jtools/Makefile index 5106df2e6..2ea44243a 100644 --- a/jtools/Makefile +++ b/jtools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk TARGETS:= ifneq ($(ADK_PACKAGE_OPENJDK),) -TARGETS+=fastjar gcj ecj jikes jamvm classpath ant openjdk +TARGETS+=fastjar gcj ecj jikes classpath jamvm ant openjdk endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) |