diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-10-22 16:54:01 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-10-23 13:20:29 +0200 |
| commit | c77a9254dde41f222bc65af957c91fa5bc166103 (patch) | |
| tree | e3b00ea22e19b9fa509e750a6af5beff3d3946d2 /solenv | |
| parent | No need to register repository (diff) | |
| download | core-c77a9254dde41f222bc65af957c91fa5bc166103.tar.gz core-c77a9254dde41f222bc65af957c91fa5bc166103.zip | |
no need for SRCDIR parameter here
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Package.mk | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 52a19363ba82..21497f5002fe 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -314,7 +314,7 @@ $(call gb_Configuration_get_target,%) : # cannot use target local variable for REPO because it's needed in prereq # last parameter may be used to turn off delivering of files define gb_Configuration_Configuration -$(eval gb_Configuration_NODELIVER_$(1) := $(3)) +$(eval gb_Configuration_NODELIVER_$(1) := $(2)) $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang))))) $(foreach lang,$(gb_Configuration_LANGS),$(eval \ diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 624783c339bd..a75c1f8c8575 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -47,12 +47,12 @@ $(call gb_CustomTarget_get_clean_target,%) : rm -f $(call gb_CustomTarget_get_target,$*)) define gb_CustomTarget__get_makefile -$(1)/$(2)/Makefile +$(SRCDIR)/$(1)/Makefile endef define gb_CustomTarget_CustomTarget $(call gb_CustomTarget_get_target,$(1)) : \ - $(call gb_CustomTarget__get_makefile,$($(2)),$(1)) + $(call gb_CustomTarget__get_makefile,$(1)) endef diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 18e03d426a4e..9d410badf347 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -85,7 +85,7 @@ $(call gb_Jar_get_target,$(1)) : MANIFEST := $(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(call gb_Jar_get_target,$(1)) : PACKAGEFILES := -$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2)) +$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1))) $(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH)) $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1)))) $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1)) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 083898dca843..10df1da38a50 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -63,7 +63,7 @@ $(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLAS $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) -$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1))) $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 23ec530009ff..742075750603 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -74,7 +74,7 @@ endef define gb_Package_add_customtarget $(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2)) $(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) -$(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3))) +$(eval $(call gb_CustomTarget_CustomTarget,$(2))) endef |