diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:36:52 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:36:52 +0200 |
| commit | 81a1c065fd3c0242efa0273eba0aefeebadcd877 (patch) | |
| tree | 3f5f6c2f91eda7581f58473c1c79857eba48ef01 /solenv/gbuild/JavaClassSet.mk | |
| parent | 6f0d3f2a5b72673086f82a88831535e535885998 (diff) | |
| parent | 13b9f49c1dcb324aa712a82de73bfeffca7b9524 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
Repository.mk
RepositoryFixes.mk
configure
configure.in
set_soenv.in
solenv/config/sdev300.ini
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/CustomTarget.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/Executable.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/StaticLibrary.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/gbuild/templates/Executable.mk
solenv/gbuild/templates/Library.mk
solenv/inc/libs.mk
solenv/inc/unxobsd.mk
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index ba9e445026fb..00aefb4ee9c6 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -30,11 +30,11 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) define gb_JavaClassSet__command $(call gb_Helper_abbreviate_dirs_native,\ - mkdir -p $(dir $(1)) && \ - $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\ + mkdir -p $(dir $(1)) && \ + $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\ $(filter-out $(JARDEPS),$(3)),\ - $(filter-out $(JARDEPS),$(4))) &&\ - touch $(1)) + $(filter-out $(JARDEPS),$(4))) &&) \ + touch $(1)) endef @@ -44,8 +44,8 @@ $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),JCS,3) - $(call gb_Helper_abbreviate_dirs,\ - rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) + $(call gb_Helper_abbreviate_dirs,\ + rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar) # UGLY: cannot use target local variable for REPO because it's needed in prereq @@ -110,4 +110,4 @@ define gb_JavaClassSet_use_externals $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) endef -# vim: set noet sw=4 ts=4: +# vim: set noet sw=4: |