copy external jars to instdir

Change-Id: Ibbae216975bf8e066f24c1a4885394e346e2eaec

apache-commons/Package_apache_commons_logging.mk → apache-commons/ExternalPackage_apache_commons_logging.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,apache_commons_logging_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging_inc,apache_commons_logging))
 
-$(eval $(call gb_Package_use_external_project,apache_commons_logging_inc,apache_commons_logging))
+$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging_inc,apache_commons_logging))
 
-$(eval $(call gb_Package_add_file,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
 
 # vim: set noet sw=4 ts=4:

apache-commons/Module_apache-commons.mk

@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,apache_commons))
 ifneq ($(SOLAR_JAVA),)
 ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,apache_commons,\
+	ExternalPackage_apache_commons_logging \
 	ExternalProject_apache_commons_codec \
 	ExternalProject_apache_commons_httpclient \
 	ExternalProject_apache_commons_lang \
@@ -19,7 +20,6 @@ $(eval $(call gb_Module_add_targets,apache_commons,\
 	Package_apache_commons_codec \
 	Package_apache_commons_httpclient \
 	Package_apache_commons_lang \
-	Package_apache_commons_logging \
 	UnpackedTarball_apache_commons_codec \
 	UnpackedTarball_apache_commons_httpclient \
 	UnpackedTarball_apache_commons_lang \

beanshell/Package_beanshell.mk → beanshell/ExternalPackage_beanshell.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,beanshell,$(call gb_UnpackedTarball_get_dir,beanshell)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell))
 
-$(eval $(call gb_Package_use_external_project,beanshell,beanshell))
+$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell))
 
-$(eval $(call gb_Package_add_file,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
 
 # vim: set noet sw=4 ts=4:

beanshell/Module_beanshell.mk

@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,beanshell))
 ifneq ($(SOLAR_JAVA),)
 ifneq ($(filter BSH,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,beanshell,\
+	ExternalPackage_beanshell \
 	ExternalProject_beanshell \
-	Package_beanshell \
 	UnpackedTarball_beanshell \
 ))
 endif

hsqldb/Package_hsqldb.mk → hsqldb/ExternalPackage_hsqldb.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,hsqldb_project,$(call gb_UnpackedTarball_get_dir,hsqldb)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb))
 
-$(eval $(call gb_Package_use_external_project,hsqldb_project,hsqldb))
+$(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb))
 
-$(eval $(call gb_Package_add_file,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar))
 
 # vim: set noet sw=4 ts=4:

hsqldb/Module_hsqldb.mk

@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,hsqldb))
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,hsqldb,\
+	ExternalPackage_hsqldb \
 	ExternalProject_hsqldb \
-	Package_hsqldb \
 	UnpackedTarball_hsqldb \
 ))
 endif

jfreereport/Package_jfreereport_flow_engine.mk → jfreereport/ExternalPackage_jfreereport_flow_engine.mk

@@ -10,10 +10,10 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_Package_Package,jfreereport_flow_engine,$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
 
-$(eval $(call gb_Package_add_file,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_flute.mk → jfreereport/ExternalPackage_jfreereport_flute.mk

@@ -10,10 +10,10 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute))
 
-$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_libbase.mk → jfreereport/ExternalPackage_jfreereport_libbase.mk

@@ -10,10 +10,10 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_Package_Package,jfreereport_libbase,$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_libbase,jfreereport_libbase))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase))
 
-$(eval $(call gb_Package_add_file,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_liblayout.mk → jfreereport/ExternalPackage_jfreereport_libfonts.mk

@@ -10,10 +10,10 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_Package_Package,jfreereport_liblayout,$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts))
 
-$(eval $(call gb_Package_add_file,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/ExternalPackage_jfreereport_libformula.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula))
+
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula))
+
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_libfonts.mk → jfreereport/ExternalPackage_jfreereport_liblayout.mk

@@ -10,10 +10,10 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_Package_Package,jfreereport_libfonts,$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_libfonts,jfreereport_libfonts))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
 
-$(eval $(call gb_Package_add_file,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/ExternalPackage_jfreereport_libloader.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader))
+
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader))
+
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:

jfreereport/ExternalPackage_jfreereport_librepository.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository))
+
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository))
+
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:

jfreereport/ExternalPackage_jfreereport_libserializer.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# for VERSION
+include $(SRCDIR)/jfreereport/version.mk
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer))
+
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer))
+
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar))
+
+# vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_libxml.mk → jfreereport/ExternalPackage_jfreereport_libxml.mk

@@ -10,10 +10,10 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_Package_Package,jfreereport_libxml,$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_libxml,jfreereport_libxml))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml))
 
-$(eval $(call gb_Package_add_file,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_sac.mk → jfreereport/ExternalPackage_jfreereport_sac.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,jfreereport_sac,$(call gb_UnpackedTarball_get_dir,jfreereport_sac)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac))
 
-$(eval $(call gb_Package_use_external_project,jfreereport_sac,jfreereport_sac))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac))
 
-$(eval $(call gb_Package_add_file,jfreereport_sac,bin/sac.jar,build/lib/sac.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_sac,bin/sac.jar,build/lib/sac.jar))
 
 # vim: set noet sw=4 ts=4:

jfreereport/Module_jfreereport.mk

@@ -14,37 +14,37 @@ ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,jfreereport,\
 	UnpackedTarball_jfreereport_sac \
 	ExternalProject_jfreereport_sac \
-	Package_jfreereport_sac \
+	ExternalPackage_jfreereport_sac \
 	UnpackedTarball_jfreereport_libbase \
 	ExternalProject_jfreereport_libbase \
-	Package_jfreereport_libbase \
+	ExternalPackage_jfreereport_libbase \
 	UnpackedTarball_jfreereport_flute \
 	ExternalProject_jfreereport_flute \
-	Package_jfreereport_flute \
+	ExternalPackage_jfreereport_flute \
 	UnpackedTarball_jfreereport_libloader \
 	ExternalProject_jfreereport_libloader \
-	Package_jfreereport_libloader \
+	ExternalPackage_jfreereport_libloader \
 	UnpackedTarball_jfreereport_libxml \
 	ExternalProject_jfreereport_libxml \
-	Package_jfreereport_libxml \
+	ExternalPackage_jfreereport_libxml \
 	UnpackedTarball_jfreereport_libformula \
 	ExternalProject_jfreereport_libformula \
-	Package_jfreereport_libformula \
+	ExternalPackage_jfreereport_libformula \
 	UnpackedTarball_jfreereport_libfonts \
 	ExternalProject_jfreereport_libfonts \
-	Package_jfreereport_libfonts \
+	ExternalPackage_jfreereport_libfonts \
 	ExternalProject_jfreereport_librepository \
 	UnpackedTarball_jfreereport_librepository \
-	Package_jfreereport_librepository \
+	ExternalPackage_jfreereport_librepository \
 	UnpackedTarball_jfreereport_libserializer \
 	ExternalProject_jfreereport_libserializer \
-	Package_jfreereport_libserializer \
+	ExternalPackage_jfreereport_libserializer \
 	UnpackedTarball_jfreereport_liblayout \
 	ExternalProject_jfreereport_liblayout \
-	Package_jfreereport_liblayout \
+	ExternalPackage_jfreereport_liblayout \
 	UnpackedTarball_jfreereport_flow_engine \
 	ExternalProject_jfreereport_flow_engine \
-	Package_jfreereport_flow_engine \
+	ExternalPackage_jfreereport_flow_engine \
 ))
 endif
 endif

jfreereport/Package_jfreereport_libformula.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_libformula,$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_libformula,jfreereport_libformula))
-
-$(eval $(call gb_Package_add_file,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_libloader.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_libloader,$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_libloader,jfreereport_libloader))
-
-$(eval $(call gb_Package_add_file,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_librepository.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_librepository,$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_librepository,jfreereport_librepository))
-
-$(eval $(call gb_Package_add_file,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:

jfreereport/Package_jfreereport_libserializer.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_libserializer,$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_libserializer,jfreereport_libserializer))
-
-$(eval $(call gb_Package_add_file,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:

rhino/Package_rhino.mk → rhino/ExternalPackage_rhino.mk

@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,rhino,$(call gb_UnpackedTarball_get_dir,rhino)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino))
 
-$(eval $(call gb_Package_use_external_project,rhino,rhino))
+$(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino))
 
-$(eval $(call gb_Package_add_file,rhino,bin/js.jar,build/rhino1_5R5/js.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,rhino,bin/js.jar,build/rhino1_5R5/js.jar))
 
 # vim: set noet sw=4 ts=4:

rhino/Module_rhino.mk

@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,rhino))
 ifneq ($(SOLAR_JAVA),)
 ifneq ($(filter RHINO,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,rhino,\
+	ExternalPackage_rhino \
 	ExternalProject_rhino \
-	Package_rhino \
 	UnpackedTarball_rhino \
 ))
 endif