diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-07 12:21:13 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-09 21:04:41 +0200 |
| commit | 4c34a4698fcf5621266e95b30a1cb5ba0a9e891e (patch) | |
| tree | 027e201b9a89f699052f5d802263055b32e73389 /solenv | |
| parent | 23572492b12a64f84dadbdd8e922ae71fe2d9c2b (diff) | |
remove unused makefile code
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 20 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 22 |
3 files changed, 0 insertions, 53 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 393d25fc94d6..ac1c151913dd 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -241,26 +241,6 @@ $(foreach customtarget,$(2),$(call gb_Jar_use_customtarget,$(1),$(customtarget)) endef -define gb_Jar_add_package_dependency -$$(call gb_Output_error,\ - gb_Jar_add_package_dependency: use gb_Jar_use_package instead.) -endef - -define gb_Jar_use_package -$(call gb_JavaClassSet_use_package,$(call gb_Jar_get_classsetname,$(1)),$(2)) - -endef - -define gb_Jar_add_package_dependencies -$$(call gb_Output_error,\ - gb_Jar_add_package_dependencies: use gb_Jar_use_packages instead.) -endef - -define gb_Jar_use_packages -$(foreach package,$(2),$(call gb_Jar_use_package,$(1),$(package))) - -endef - # possible directories for jar files containing UNO services gb_Jar_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \ diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index b1bfa07edfb1..7e0954a49e2f 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -195,15 +195,4 @@ $(call gb_JavaClassSet_get_preparation_target,$(1)) : \ endef -define gb_JavaClassSet_add_package_dependency -$$(call gb_Output_error,\ - gb_JavaClassSet_add_package_dependency: use gb_JavaClassSet_use_package instead.) -endef - -define gb_JavaClassSet_use_package -$(call gb_JavaClassSet_get_preparation_target,$(1)) : \ - $(call gb_Package_get_target,$(2)) - -endef - # vim: set noet sw=4: diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 187b0678424e..40c23aae06c1 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -159,26 +159,6 @@ $(foreach dependency,$(2),$(call gb_JunitTest_use_customtarget,$(1),$(dependency endef -define gb_JunitTest_add_package_dependency -$$(call gb_Output_error,\ - gb_JunitTest_add_package_dependency: use gb_JunitTest_use_package instead.) -endef - -define gb_JunitTest_use_package -$(call gb_JavaClassSet_use_package,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) - -endef - -define gb_JunitTest_add_package_dependencies -$$(call gb_Output_error,\ - gb_JunitTest_add_package_dependencies: use gb_JunitTest_use_packages instead.) -endef - -define gb_JunitTest_use_packages -$(foreach dependency,$(2),$(call gb_JunitTest_use_package,$(1),$(dependency))) - -endef - else # OOO_JUNIT_JAR .PHONY : $(call gb_JunitTest_get_target,$(1)) @@ -200,8 +180,6 @@ gb_JunitTest_use_jars := gb_JunitTest_use_jar_classset := gb_JunitTest_use_customtarget := gb_JunitTest_use_customtargets := -gb_JunitTest_use_package := -gb_JunitTest_use_packages := endif # OOO_JUNIT_JAR # vim: set noet sw=4: |