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 /filter | |
| parent | eba6bc1b985c6caede347e48d636fd161b6413c0 (diff) | |
no need for SRCDIR parameter here
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 4 | ||||
| -rw-r--r-- | filter/Jar_XSLTFilter.mk | 2 | ||||
| -rw-r--r-- | filter/Jar_XSLTValidate.mk | 2 | ||||
| -rw-r--r-- | filter/Package_filter_generated.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 07301dcd9500..c8e5593c34d4 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -65,7 +65,7 @@ $(call gb_Configuration_get_target,$(1)) : \ $(call gb_Configuration_get_clean_target,$(1)) : $(6) $(if $(4),,$(error filter_Configuration__add_module: no input files)) $(5) : \ - $(addprefix $($(gb_Configuration_REPO_$(1)))/$(3)/,$(addsuffix .xcu,$(4))) + $(addprefix $(SRCDIR)/$(3)/,$(addsuffix .xcu,$(4))) $(call gb_XcuModuleTarget_get_outdir_target,$(2)) : $(5) $(call gb_Deliver_add_deliverable,\ $(call gb_XcuModuleTarget_get_outdir_target,$(2)),$(5),$(2)) @@ -266,7 +266,7 @@ endef ### the filter configuration ######################################## -$(eval $(call gb_Configuration_Configuration,fcfg_langpack,SRCDIR)) +$(eval $(call gb_Configuration_Configuration,fcfg_langpack)) $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Zip_add_file,fcfg_langpack_$(lang),$(filter_XCU_filter)))) diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk index 4bd5d2a4e715..d68b3530370d 100644 --- a/filter/Jar_XSLTFilter.mk +++ b/filter/Jar_XSLTFilter.mk @@ -17,7 +17,7 @@ # under the License. #*************************************************************** -$(eval $(call gb_Jar_Jar,XSLTFilter,SRCDIR)) +$(eval $(call gb_Jar_Jar,XSLTFilter)) $(eval $(call gb_Jar_add_jars,XSLTFilter,\ $(OUTDIR)/bin/ridl.jar \ diff --git a/filter/Jar_XSLTValidate.mk b/filter/Jar_XSLTValidate.mk index 6f1ab4cedf46..cd578fae0167 100644 --- a/filter/Jar_XSLTValidate.mk +++ b/filter/Jar_XSLTValidate.mk @@ -17,7 +17,7 @@ # under the License. #*************************************************************** -$(eval $(call gb_Jar_Jar,XSLTValidate,SRCDIR)) +$(eval $(call gb_Jar_Jar,XSLTValidate)) $(eval $(call gb_Jar_add_jars,XSLTValidate,\ $(OUTDIR)/bin/ridl.jar \ diff --git a/filter/Package_filter_generated.mk b/filter/Package_filter_generated.mk index bdcd213b15a8..d93416bbf4f8 100644 --- a/filter/Package_filter_generated.mk +++ b/filter/Package_filter_generated.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Package_Package,filter_generated,$(WORKDIR)/CustomTarget/filter/source/svg)) -$(eval $(call gb_Package_add_customtarget,filter_generated,filter/source/svg,SRCDIR)) +$(eval $(call gb_Package_add_customtarget,filter_generated,filter/source/svg)) $(eval $(call gb_CustomTarget_add_dependencies,filter/source/svg,\ filter/source/svg/gentoken.pl \ |