diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 19:30:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 20:17:26 +0100 |
| commit | 8df17a34095dce7db16d9d2e505043f806704f66 (patch) | |
| tree | 80695a18d5364344e1ac1ee376200a96fe569268 | |
| parent | 176782e3030d17a05dc7addf4f23bb465995a1db (diff) | |
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
201 files changed, 58 insertions, 346 deletions
diff --git a/bridges/Package_jnilib_java_uno.mk b/bridges/Package_jnilib_java_uno.mk index 918acd9cf97c..446613fc93cd 100644 --- a/bridges/Package_jnilib_java_uno.mk +++ b/bridges/Package_jnilib_java_uno.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,bridges_jnilib_java_uno,$(SRCDIR))) -$(eval $(call gb_Package_set_outdir,bridges_jnilib_java_uno,$(INSTROOT))) - $(eval $(call gb_Package_add_symbolic_link,bridges_jnilib_java_uno,$(LIBO_URE_LIB_FOLDER)/$(basename $(notdir $(call gb_Library_get_target,java_uno))).jnilib,$(notdir $(call gb_Library_get_target,java_uno)))) # vim: set noet sw=4 ts=4: diff --git a/cli_ure/Package_cli_basetypes_copy.mk b/cli_ure/Package_cli_basetypes_copy.mk index 8cb20cecdb82..75abab150888 100644 --- a/cli_ure/Package_cli_basetypes_copy.mk +++ b/cli_ure/Package_cli_basetypes_copy.mk @@ -10,8 +10,6 @@ $(eval $(call gb_Package_Package,cli_basetypes_copy,$(INSTROOT))) -$(eval $(call gb_Package_set_outdir,cli_basetypes_copy,$(INSTDIR))) - # duplicate copy to work around CLR DLL finding brain damage $(eval $(call gb_Package_add_files,cli_basetypes_copy,$(SDKDIRNAME)/bin,\ $(LIBO_URE_LIB_FOLDER)/cli_basetypes.dll \ diff --git a/cli_ure/Package_version.mk b/cli_ure/Package_version.mk index 6ab670e188de..675d32a98fc6 100644 --- a/cli_ure/Package_version.mk +++ b/cli_ure/Package_version.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,cli_ure_version,$(SRCDIR)/cli_ure/version)) +$(eval $(call gb_Package_set_outdir,cli_ure_version,$(OUTDIR))) + $(eval $(call gb_Package_add_file,cli_ure_version,bin/cliureversion.mk,version.txt)) # vim: set noet sw=4 ts=4: diff --git a/connectivity/Package_postgresql-sdbc.mk b/connectivity/Package_postgresql-sdbc.mk index c4f1d240249d..2820fc429bca 100644 --- a/connectivity/Package_postgresql-sdbc.mk +++ b/connectivity/Package_postgresql-sdbc.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,connectivity_postgresql-sdbc,$(SRCDIR)/connectivity/source/drivers/postgresql)) -$(eval $(call gb_Package_set_outdir,connectivity_postgresql-sdbc,$(INSTROOT))) - $(eval $(call gb_Package_add_file,connectivity_postgresql-sdbc,$(LIBO_BIN_FOLDER)/postgresql-sdbc.ini,postgresql-sdbc.ini)) # vim: set noet sw=4 ts=4: diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index a7f9bc0e2def..4cd39c8ca3fa 100644 --- a/desktop/Package_branding.mk +++ b/desktop/Package_branding.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy)) -$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTROOT))) - $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\ $(if $(filter intro.png,$(image)),\ diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk index 456d545ee7c0..c2b6181f9c8f 100644 --- a/desktop/Package_branding_custom.mk +++ b/desktop/Package_branding_custom.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR))) -$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT))) - $(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER),\ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ )) diff --git a/desktop/Package_desktop_install.mk b/desktop/Package_desktop_install.mk index ad7a74ca8172..00d75467ff7f 100644 --- a/desktop/Package_desktop_install.mk +++ b/desktop/Package_desktop_install.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_install,$(SRCDIR))) -$(eval $(call gb_Package_set_outdir,desktop_install,$(INSTROOT))) - $(eval $(call gb_Package_add_symbolic_link,desktop_install,program,MacOS)) # vim: set noet sw=4 ts=4: diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index 046ba69dc5cd..4ed94ad2f0d4 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts)) -$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT))) - ifeq (,$(filter MACOSX WNT,$(OS))) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace)) diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk index c0aadbdbd3e7..046c95f45996 100644 --- a/desktop/Package_soffice_sh.mk +++ b/desktop/Package_soffice_sh.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice))) -$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTROOT))) - $(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh)) # vim:set noet sw=4 ts=4: diff --git a/extensions/Package_OOoSpotlightImporter.mk b/extensions/Package_OOoSpotlightImporter.mk index 545af571c83f..35cfa24ddce4 100644 --- a/extensions/Package_OOoSpotlightImporter.mk +++ b/extensions/Package_OOoSpotlightImporter.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extensions_OOoSpotlightImporter,$(gb_Library_DLLDIR))) -$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(INSTROOT))) - $(eval $(call gb_Package_add_file,extensions_OOoSpotlightImporter,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/MacOS/OOoSpotlightImporter,$(call gb_Library_get_runtime_filename,OOoSpotlightImporter))) # vim: set noet sw=4 ts=4: diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk index 6b812277213d..3677116936a6 100644 --- a/extensions/Package_mdibundle.mk +++ b/extensions/Package_mdibundle.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter)) -$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\ Info.plist \ en.lproj/schema.strings \ diff --git a/external/afms/ExternalPackage_fontunxafm.mk b/external/afms/ExternalPackage_fontunxafm.mk index 936b1af6e709..97c7e489eb2c 100644 --- a/external/afms/ExternalPackage_fontunxafm.mk +++ b/external/afms/ExternalPackage_fontunxafm.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms)) -$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,$(LIBO_SHARE_FOLDER)/psprint/fontmetric,\ Courier-Bold.afm \ Courier-BoldOblique.afm \ diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index 6ee1933aee48..5a37df27d90b 100644 --- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk +++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging)) -$(eval $(call gb_ExternalPackage_set_outdir,apache_commons_logging,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging)) $(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk index 0cb34cd30010..f6e4ad12c89f 100644 --- a/external/beanshell/ExternalPackage_beanshell.mk +++ b/external/beanshell/ExternalPackage_beanshell.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) -$(eval $(call gb_ExternalPackage_set_outdir,beanshell,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) $(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b1.jar)) diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index 34462f6fff66..e40fc5496489 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo)) -$(eval $(call gb_ExternalPackage_set_outdir,cairo,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) $(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk index ee3bf1139da8..ead02895cdf6 100644 --- a/external/cairo/ExternalPackage_pixman.mk +++ b/external/cairo/ExternalPackage_pixman.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman)) -$(eval $(call gb_ExternalPackage_set_outdir,pixman,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) $(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4)) diff --git a/external/ct2n/ExternalPackage_ct2n.mk b/external/ct2n/ExternalPackage_ct2n.mk index 599e4335a3f1..ead604e2e9e5 100644 --- a/external/ct2n/ExternalPackage_ct2n.mk +++ b/external/ct2n/ExternalPackage_ct2n.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,ct2n,ConvertTextToNumber)) -$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\ Addons.xcu \ CT2N/MainCode.xba \ diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 89b8699bd374..fa8b3251c045 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl)) -$(eval $(call gb_ExternalPackage_set_outdir,curl,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 882544c19b7c..0a14e4106469 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird)) -$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) ifeq ($(OS)-$(COM),WNT-MSC) diff --git a/external/hsqldb/ExternalPackage_hsqldb.mk b/external/hsqldb/ExternalPackage_hsqldb.mk index 3b7397a7c304..e4dbb363b7d0 100644 --- a/external/hsqldb/ExternalPackage_hsqldb.mk +++ b/external/hsqldb/ExternalPackage_hsqldb.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb)) -$(eval $(call gb_ExternalPackage_set_outdir,hsqldb_project,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb)) $(eval $(call gb_ExternalPackage_add_file,hsqldb_project,$(LIBO_SHARE_JAVA_FOLDER)/hsqldb.jar,lib/hsqldb.jar)) diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index 0ba76dc6da82..be3a1d80491a 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -11,8 +11,6 @@ icu_VERSION := $(ICU_MAJOR).$(ICU_MINOR)$(if $(ICU_MICRO),.$(ICU_MICRO)) $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) -$(eval $(call gb_ExternalPackage_set_outdir,icu,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk index 3c93fcebde1e..9b1ecf64d9c5 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_flow_engine,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_flow_engine,$(LIBO_SHARE_JAVA_FOLDER)/flow-engine.jar,build/lib/flow-engine.jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk index d97619c1ca0e..bdc08a06bf0a 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_flute.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flute.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_flute,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_flute,$(LIBO_SHARE_JAVA_FOLDER)/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk index eebb8092df0f..e3329d186956 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libbase,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_libbase,$(LIBO_SHARE_JAVA_FOLDER)/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk index edc3b78ae009..910f15ffb331 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libfonts,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_libfonts,$(LIBO_SHARE_JAVA_FOLDER)/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk index 790d5d24d42e..8fb9ca99ea84 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libformula,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_libformula,$(LIBO_SHARE_JAVA_FOLDER)/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk index 9588a89e07b2..0a5307cb8994 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_liblayout,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_liblayout,$(LIBO_SHARE_JAVA_FOLDER)/liblayout.jar,build/lib/liblayout.jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk index ee1c6f3dc706..6cec115b8320 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libloader,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_libloader,$(LIBO_SHARE_JAVA_FOLDER)/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk index 2fc36d16d96f..63662ad1b47a 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_librepository,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_librepository,$(LIBO_SHARE_JAVA_FOLDER)/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk index 0eb92599d2e7..f12d6882d5a8 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libserializer,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_libserializer,$(LIBO_SHARE_JAVA_FOLDER)/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk index 79b39d5ebf66..13c207815c2a 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk @@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libxml,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_libxml,$(LIBO_SHARE_JAVA_FOLDER)/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) diff --git a/external/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk index ad27f11a0ac9..cfdf31ab62bc 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_sac.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_sac.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac)) -$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_sac,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac)) $(eval $(call gb_ExternalPackage_add_file,jfreereport_sac,$(LIBO_SHARE_JAVA_FOLDER)/sac.jar,build/lib/sac.jar)) diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk index 294347f171be..2785ea88c81e 100644 --- a/external/lcms2/ExternalPackage_lcms2.mk +++ b/external/lcms2/ExternalPackage_lcms2.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) -$(eval $(call gb_ExternalPackage_set_outdir,lcms2,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/libexttextcat/ExternalPackage_fingerprint.mk b/external/libexttextcat/ExternalPackage_fingerprint.mk index 027d1ce810eb..38bff25ec47a 100644 --- a/external/libexttextcat/ExternalPackage_fingerprint.mk +++ b/external/libexttextcat/ExternalPackage_fingerprint.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,exttextcat)) -$(eval $(call gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,libexttextcat_fingerprint,$(LIBO_SHARE_FOLDER)/fingerprint,\ langclass/fpdb.conf \ langclass/LM/ab.lm \ diff --git a/external/liblangtag/ExternalPackage_langtag_data.mk b/external/liblangtag/ExternalPackage_langtag_data.mk index 3435e7080e1c..4c7973adcb26 100644 --- a/external/liblangtag/ExternalPackage_langtag_data.mk +++ b/external/liblangtag/ExternalPackage_langtag_data.mk @@ -9,6 +9,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag)) +$(eval $(call gb_ExternalPackage_set_outdir,langtag_data,$(OUTDIR))) + $(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag,data/language-subtag-registry.xml)) $(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\ data/common/bcp47/calendar.xml \ diff --git a/external/liblangtag/ExternalPackage_liblangtag_data.mk b/external/liblangtag/ExternalPackage_liblangtag_data.mk index 0991d9621ea2..24375f27f830 100644 --- a/external/liblangtag/ExternalPackage_liblangtag_data.mk +++ b/external/liblangtag/ExternalPackage_liblangtag_data.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag)) -$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\ data/language-subtag-registry.xml \ )) diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index b60f3d006fb9..0eb216f54c35 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2)) -$(eval $(call gb_ExternalPackage_set_outdir,xml2,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2)) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 6933e35a74bf..5e318c83295c 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt)) -$(eval $(call gb_ExternalPackage_set_outdir,xslt,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt)) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk index bd2715ad7a19..23c2c5abfa03 100644 --- a/external/lpsolve/ExternalPackage_lpsolve.mk +++ b/external/lpsolve/ExternalPackage_lpsolve.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve)) -$(eval $(call gb_ExternalPackage_set_outdir,lpsolve,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve)) ifneq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/mingw-externals/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk index cc58cf9f5ab2..bd2ed1a48b18 100644 --- a/external/mingw-externals/Package_jawt.mk +++ b/external/mingw-externals/Package_jawt.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) +$(error FIXME do not deliver this stuff to OUTDIR) + $(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk index c85032a3c60e..65a042d4d0b2 100644 --- a/external/mingw-externals/Package_mingw_dlls.mk +++ b/external/mingw-externals/Package_mingw_dlls.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) -$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTROOT))) - $(eval $(call gb_Package_add_files,mingw_dlls,bin,\ $(sort $(MINGW_DLLS)) \ )) diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk index 521db37da155..d3f94d1af1fa 100644 --- a/external/mingw-externals/Package_mingw_gccdlls.mk +++ b/external/mingw-externals/Package_mingw_gccdlls.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) +$(error FIXME do not deliver this stuff to OUTDIR) + $(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \ $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \ diff --git a/external/more_fonts/ExternalPackage_caladea.mk b/external/more_fonts/ExternalPackage_caladea.mk index d26cb476d395..9632a9d6b753 100644 --- a/external/more_fonts/ExternalPackage_caladea.mk +++ b/external/more_fonts/ExternalPackage_caladea.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_caladea,font_caladea)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_caladea,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_caladea,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ Caladea-Italic.ttf \ Caladea-Regular.ttf \ diff --git a/external/more_fonts/ExternalPackage_carlito.mk b/external/more_fonts/ExternalPackage_carlito.mk index d110161eb01a..1e09a554daad 100644 --- a/external/more_fonts/ExternalPackage_carlito.mk +++ b/external/more_fonts/ExternalPackage_carlito.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_carlito,font_carlito)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_carlito,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_carlito,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ Carlito-BoldItalic.ttf \ Carlito-Regular.ttf \ diff --git a/external/more_fonts/ExternalPackage_dejavu.mk b/external/more_fonts/ExternalPackage_dejavu.mk index d307041af5db..22e7f6c4eef5 100644 --- a/external/more_fonts/ExternalPackage_dejavu.mk +++ b/external/more_fonts/ExternalPackage_dejavu.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ ttf/DejaVuSans-Bold.ttf \ ttf/DejaVuSans-BoldOblique.ttf \ diff --git a/external/more_fonts/ExternalPackage_gentium.mk b/external/more_fonts/ExternalPackage_gentium.mk index 2099d66f82f0..aa846271deae 100644 --- a/external/more_fonts/ExternalPackage_gentium.mk +++ b/external/more_fonts/ExternalPackage_gentium.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ GenBasB.ttf \ GenBasBI.ttf \ diff --git a/external/more_fonts/ExternalPackage_liberation.mk b/external/more_fonts/ExternalPackage_liberation.mk index b3a43c879aac..a57207446e21 100644 --- a/external/more_fonts/ExternalPackage_liberation.mk +++ b/external/more_fonts/ExternalPackage_liberation.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationMono-Bold.ttf \ LiberationMono-BoldItalic.ttf \ diff --git a/external/more_fonts/ExternalPackage_liberation_narrow.mk b/external/more_fonts/ExternalPackage_liberation_narrow.mk index 93af73aae165..2fc52f3bbb5e 100644 --- a/external/more_fonts/ExternalPackage_liberation_narrow.mk +++ b/external/more_fonts/ExternalPackage_liberation_narrow.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationSansNarrow-Bold.ttf \ LiberationSansNarrow-BoldItalic.ttf \ diff --git a/external/more_fonts/ExternalPackage_libertineg.mk b/external/more_fonts/ExternalPackage_libertineg.mk index 4e08aa2bc42d..9c97b3ba3cd9 100644 --- a/external/more_fonts/ExternalPackage_libertineg.mk +++ b/external/more_fonts/ExternalPackage_libertineg.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LinBiolinum_RB_G.ttf \ LinBiolinum_RI_G.ttf \ diff --git a/external/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk index 53be59399312..adbf9230304f 100644 --- a/external/more_fonts/ExternalPackage_opensans.mk +++ b/external/more_fonts/ExternalPackage_opensans.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ OpenSans-BoldItalic.ttf \ OpenSans-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk index c9f0c988320d..41dedfc8e486 100644 --- a/external/more_fonts/ExternalPackage_ptserif.mk +++ b/external/more_fonts/ExternalPackage_ptserif.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ PT_Serif-Web-BoldItalic.ttf \ PT_Serif-Web-Bold.ttf \ diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk index 416d44e1016d..6160e56ee32a 100644 --- a/external/more_fonts/ExternalPackage_sourcecode.mk +++ b/external/more_fonts/ExternalPackage_sourcecode.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceCodePro-Bold.ttf \ SourceCodePro-Regular.ttf \ diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk index bf6d315bf865..45f21d6f99ab 100644 --- a/external/more_fonts/ExternalPackage_sourcesans.mk +++ b/external/more_fonts/ExternalPackage_sourcesans.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceSansPro-BoldItalic.ttf \ SourceSansPro-Bold.ttf \ diff --git a/external/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk index 43b9843d67a8..2d259c2175c3 100644 --- a/external/more_fonts/Package_conf.mk +++ b/external/more_fonts/Package_conf.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts)) -$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTROOT))) - $(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) # vim: set noet sw=4 ts=4: diff --git a/external/moz/ExternalPackage_moz_lib.mk b/external/moz/ExternalPackage_moz_lib.mk index 6246b212cdc6..5d21127a2052 100644 --- a/external/moz/ExternalPackage_moz_lib.mk +++ b/external/moz/ExternalPackage_moz_lib.mk @@ -9,6 +9,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,moz_lib,moz_lib)) +$(eval $(call gb_ExternalPackage_set_outdir,moz_lib,$(OUTDIR))) + $(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\ nslber32v50.lib \ nsldap32v50.lib \ diff --git a/external/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk index ca1cb11ef08b..d141f83ece47 100644 --- a/external/moz/ExternalPackage_runtime.mk +++ b/external/moz/ExternalPackage_runtime.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime)) -$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(LIBO_BIN_FOLDER),\ components/addrbook.dll \ components/addrbook.xpt \ diff --git a/external/msc-externals/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk index 438783938152..f6f684a7c077 100644 --- a/external/msc-externals/Package_dbghelp.mk +++ b/external/msc-externals/Package_dbghelp.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION))) +$(eval $(call gb_Package_set_outdir,dbghelp,$(OUTDIR))) + $(eval $(call gb_Package_add_file,dbghelp,bin/dbghelp.dll,$(DBGHELP_DLL))) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/msc-externals/Package_msms.mk b/external/msc-externals/Package_msms.mk index 283e11317b88..9ffa294cf414 100644 --- a/external/msc-externals/Package_msms.mk +++ b/external/msc-externals/Package_msms.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,msms,$(MSM_PATH))) +$(eval $(call gb_Package_set_outdir,msms,$(OUTDIR))) + $(eval $(call gb_Package_add_files,msms,bin,\ $(MERGE_MODULES) \ )) diff --git a/external/msc-externals/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk index 5e510801d818..0a2feeda2f84 100644 --- a/external/msc-externals/Package_msvc80_dlls.mk +++ b/external/msc-externals/Package_msvc80_dlls.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,msvc80_dlls,$(MSVC80_DLL_PATH))) +$(eval $(call gb_Package_set_outdir,msvc80_dlls,$(OUTDIR))) + $(eval $(call gb_Package_add_files,msvc80_dlls,bin,\ $(MSVC80_DLLS) \ )) diff --git a/external/msc-externals/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk index dd68f10c4f95..d82dd06c3cec 100644 --- a/external/msc-externals/Package_msvc_dlls.mk +++ b/external/msc-externals/Package_msvc_dlls.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH))) -$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTROOT))) - $(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\ $(MSVC_DLLS) \ )) diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk index efa6c705451b..253661c67fde 100644 --- a/extras/ExternalPackage_accessoriesgallery.mk +++ b/extras/ExternalPackage_accessoriesgallery.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\ accessories/sg1010.sdg \ accessories/sg1010.sdv \ diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk index 1961f4cc5dd7..fda7c760e52b 100644 --- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk +++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk @@ -10,8 +10,6 @@ #$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People)) $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\ accessories/Draws/People/Baboo1.png \ accessories/Draws/People/Jac1.png \ diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk index 8a81b568a2a3..8e5e49d32e98 100644 --- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk +++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\ accessories/Elements/Bullets2/amethyst.arrow.png \ accessories/Elements/Bullets2/amethyst.asterisk.png \ diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/extras/ExternalPackage_accessoriesgallerynonfree.mk index ea5d87288d63..3a7e37b571d1 100644 --- a/extras/ExternalPackage_accessoriesgallerynonfree.mk +++ b/extras/ExternalPackage_accessoriesgallerynonfree.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\ accessories-nonfree/sg600.sdg \ accessories-nonfree/sg600.sdv \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk index 72c265c884fd..01f405f92449 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\ accessories/Photos/Buildings/ArkSoft0408010009.jpg \ accessories/Photos/Buildings/ArkSoft0408010023.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk index 6af42c3e71c2..41e0eed18630 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\ accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \ accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk index 82dc8ccdcd3a..a7f5cd73096e 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\ accessories/Photos/Cities/ArkSoft0507170040.jpg \ accessories/Photos/Cities/ArkSoft0507170041.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk index 8bf04c056f7b..cad78c355ef3 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfauna,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\ accessories/Photos/Fauna/ArkSoft0407030001.jpg \ accessories/Photos/Fauna/bee_on_citrus.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk index 9cfbae6594c7..19da06390797 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosflowers,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\ accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \ accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk index 7398ddb287fa..fc0bc22e72de 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfoodsanddrinks,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\ accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \ accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk index 58215c825227..32ad66e55cc8 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoshumans,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\ accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \ accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk index 0f8fd559ccfb..4fe487a5aeed 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoslandscapes,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\ accessories/Photos/Landscapes/ArkSoft0405010010.jpg \ accessories/Photos/Landscapes/ArkSoft0405010019.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk index ee731b315c9f..fbb73469739c 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosobjects,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\ accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \ accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk index 5cf1e84702f6..8b2cd6ba3aa1 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosplants,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\ accessories/Photos/Plants/ArkSoft0405020018.jpg \ accessories/Photos/Plants/ArkSoft0405020019.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk index ad0ff113429e..2162831d0110 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosspace,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\ accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \ accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk index 6be90e09c04e..d100d1d71bcc 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosstatues,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\ accessories/Photos/Statues/ArkSoft0507170027.jpg \ accessories/Photos/Statues/ArkSoft0507170032.jpg \ diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk index 0b0aac66d08c..63265c3265a5 100644 --- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk +++ b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotostravel,gallery-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\ accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \ accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \ diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/extras/ExternalPackage_accessoriestemplatescommon.mk index bdc80af62a54..975520a89488 100644 --- a/extras/ExternalPackage_accessoriestemplatescommon.mk +++ b/extras/ExternalPackage_accessoriestemplatescommon.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommon,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\ templates/common/dummy_common_templates.txt \ templates/common/svn-commit.2.tmp \ diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk index de8a553ba66d..771db9a4a392 100644 --- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk +++ b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommoneducate,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\ templates/common/educate/A4-chequered.otg \ templates/common/educate/A4-lin_2mm.otg \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk index e8008783942f..343061b5764b 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonfinance,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\ templates/common/finance/dummy_common_templates.txt \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonforms.mk b/extras/ExternalPackage_accessoriestemplatescommonforms.mk index 139820d7f402..0bcfae6be014 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonforms.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonforms,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\ templates/common/forms/dummy_common_templates.txt \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk index d5bf926b8dde..a16b04893932 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlabels,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\ templates/common/labels/24_port_patch_text.otg \ templates/common/labels/arrows-black-base.ott \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk index 9e19b4b286d4..c1de6724ac45 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlayout,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\ templates/common/layout/31407-squares.otp \ templates/common/layout/abstract-015_1.jpg.otp \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk index 3b548d95bd4b..769da4aa0933 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonmisc,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\ templates/common/misc/White_Notebook_Paper_legal.ott \ templates/common/misc/Yellow_Pad_Legal.ott \ diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk index 9cdbc3a49e0a..3e8518c84e35 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonofficorr,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\ templates/common/officorr/dummy_common_templates.txt \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk index 09d5815029f0..780c5ead8e67 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonoffimisc,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\ templates/common/offimisc/dummy_common_templates.txt \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk index fcb2ca890615..42a7b7d82df8 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpersonal,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\ templates/common/personal/szivesoldal.otg \ )) diff --git a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk index 732043f7e629..51eba77b5f7d 100644 --- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk +++ b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpresent,templates-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\ templates/common/presnt/dummy_common_templates.txt \ )) diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk index f82e560fc55d..9e7d5e8cbb24 100644 --- a/extras/ExternalPackage_extra_fonts.mk +++ b/extras/ExternalPackage_extra_fonts.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack)) -$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack)) $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk index d6d65dce704b..773f08b83d90 100644 --- a/extras/Package_autocorr.mk +++ b/extras/Package_autocorr.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext))) -$(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr,\ acor_af-ZA.dat \ acor_bg-BG.dat \ diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk index 64fd70d7762d..054295dca515 100644 --- a/extras/Package_autotextuser.mk +++ b/extras/Package_autotextuser.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext)) -$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\ mytexts.bau \ )) diff --git a/extras/Package_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk index 483617d1351a..250b7c10d5d7 100644 --- a/extras/Package_cfgsrvbitmapunx.mk +++ b/extras/Package_cfgsrvbitmapunx.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps)) -$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,$(LIBO_SHARE_FOLDER)/config,\ psetupl.xpm \ psetup.xpm \ diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk index 7e90279cd759..b1cd16f320c4 100644 --- a/extras/Package_cfgsrvnolang.mk +++ b/extras/Package_cfgsrvnolang.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config)) -$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,$(LIBO_SHARE_FOLDER)/config,\ wizard/form/styles/beige.css \ wizard/form/styles/bgr.css \ diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk index 41685ac64c98..ab318ebafd02 100644 --- a/extras/Package_cfgusr.mk +++ b/extras/Package_cfgusr.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_config)) -$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_cfgusr,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ autotbl.fmt \ )) diff --git a/extras/Package_database.mk b/extras/Package_database.mk index 4d1c47e321cf..357e21403df9 100644 --- a/extras/Package_database.mk +++ b/extras/Package_database.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database)) -$(eval $(call gb_Package_set_outdir,extras_database,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_database,$(LIBO_SHARE_PRESETS_FOLDER)/database,\ biblio.odb \ evolocal.odb \ diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk index 459aa2520578..e77d4b4daafe 100644 --- a/extras/Package_databasebiblio.mk +++ b/extras/Package_databasebiblio.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/database)) -$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_databasebiblio,$(LIBO_SHARE_PRESETS_FOLDER)/database/biblio,\ biblio.dbf \ biblio.dbt \ diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk index 39f0c8d2713f..a88679eee2db 100644 --- a/extras/Package_extensions.mk +++ b/extras/Package_extensions.mk @@ -11,6 +11,8 @@ # be delivered from somewhere, so why not from extras... $(eval $(call gb_Package_Package,extras_extensions,$(TARFILE_LOCATION))) +$(eval $(call gb_Package_set_outdir,extras_extensions,$(OUTDIR))) + ifneq ($(BARCODE_EXTENSION_PACK),) $(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK))) endif diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk index 35210126a438..952c8286a5e7 100644 --- a/extras/Package_fonts.mk +++ b/extras/Package_fonts.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras)) -$(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTROOT))) - $(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk index 3044384c574c..296250ce9127 100644 --- a/extras/Package_gallbullets.mk +++ b/extras/Package_gallbullets.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets)) -$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\ blkpearl.gif \ bluarrow.gif \ diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk index 4dadefabe81f..43587fa1c66d 100644 --- a/extras/Package_gallhtmlexpo.mk +++ b/extras/Package_gallhtmlexpo.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo)) -$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\ bludown.gif \ blufirs_.gif \ diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk index 964a5bcc6c1b..88149916095d 100644 --- a/extras/Package_gallmytheme.mk +++ b/extras/Package_gallmytheme.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_mytheme)) -$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\ sg30.sdv \ sg30.thm \ diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk index b0b2fb722901..fe59ca573477 100644 --- a/extras/Package_gallroot.mk +++ b/extras/Package_gallroot.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery)) -$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallroot,$(LIBO_SHARE_FOLDER)/gallery,\ apples.gif \ bigapple.gif \ diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk index 5a29baaf128e..f8882d86cf4f 100644 --- a/extras/Package_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system)) -$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\ sg1.sdg \ sg1.sdv \ diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk index a989b1118639..f46a80c36b52 100644 --- a/extras/Package_gallwwwback.mk +++ b/extras/Package_gallwwwback.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back)) -$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallwwwback,$(LIBO_SHARE_FOLDER)/gallery/www-back,\ aqua.jpg \ bathroom.jpg \ diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk index 33725d4b74e5..0cb737b8084c 100644 --- a/extras/Package_gallwwwgraf.mk +++ b/extras/Package_gallwwwgraf.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf)) -$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_gallwwwgraf,$(LIBO_SHARE_FOLDER)/gallery/www-graf,\ bluat.gif \ bluback.gif \ diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk index 2dbce19501da..1590550f3270 100644 --- a/extras/Package_glade.mk +++ b/extras/Package_glade.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade))) -$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTROOT))) - $(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk index 66b640873721..0b8613d880d3 100644 --- a/extras/Package_labels.mk +++ b/extras/Package_labels.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels)) -$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTROOT))) - $(eval $(call gb_Package_add_file,extras_labels,$(LIBO_SHARE_FOLDER)/labels/labels.xml,labels.xml)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk index 7517c7b0b4f8..157a17d01554 100644 --- a/extras/Package_newfiles.mk +++ b/extras/Package_newfiles.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew)) -$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_newfiles,$(LIBO_SHARE_FOLDER)/template/shellnew,\ soffice.odg \ soffice.odp \ diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk index f9aacba27a68..bc317e2465a9 100644 --- a/extras/Package_palettes.mk +++ b/extras/Package_palettes.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes)) -$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/config,\ arrowhd.soe \ classic.sog \ diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk index 255ee1b47cc3..32c3bd57cebc 100644 --- a/extras/Package_tpllayoutimpr.mk +++ b/extras/Package_tpllayoutimpr.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout)) -$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tpllayoutimpr,$(LIBO_SHARE_FOLDER)/template/common/layout,\ AbstractGreen.otp \ AbstractRed.otp \ diff --git a/extras/Package_tplwizagenda.mk b/extras/Package_tplwizagenda.mk index cbb8f4fc6978..af0ab7eba57e 100644 --- a/extras/Package_tplwizagenda.mk +++ b/extras/Package_tplwizagenda.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda)) -$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizagenda,$(LIBO_SHARE_FOLDER)/template/common/wizard/agenda,\ 10grey.ott \ 1simple.ott \ diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk index e29068bc9f88..6fdc3cb66340 100644 --- a/extras/Package_tplwizbitmap.mk +++ b/extras/Package_tplwizbitmap.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap)) -$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/template/wizard/bitmap,\ cancel_down.bmp \ cancel_up.bmp \ diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk index 1081f20b8ac2..aafdf791cd7a 100644 --- a/extras/Package_tplwizdesktop.mk +++ b/extras/Package_tplwizdesktop.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop)) -$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizdesktop,$(LIBO_SHARE_FOLDER)/template/common/internal,\ html.stw \ idxexample.odt \ diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk index be0e87a3a234..6519c3cfc612 100644 --- a/extras/Package_tplwizfax.mk +++ b/extras/Package_tplwizfax.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax)) -$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizfax,$(LIBO_SHARE_FOLDER)/template/common/wizard/fax,\ bus-classic_f.ott \ bus-classic-pri_f.ott \ diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk index 386800f049a9..2829fefce570 100644 --- a/extras/Package_tplwizletter.mk +++ b/extras/Package_tplwizletter.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter)) -$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizletter,$(LIBO_SHARE_FOLDER)/template/common/wizard/letter,\ bus-elegant_l.ott \ bus-modern_l.ott \ diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk index d7a2ee5ffd65..ec09a959a09a 100644 --- a/extras/Package_tplwizreport.mk +++ b/extras/Package_tplwizreport.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report)) -$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizreport,$(LIBO_SHARE_FOLDER)/template/common/wizard/report,\ cnt-011.ott \ cnt-012.ott \ diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk index 9f8b64c5bcc5..26d188f02c2c 100644 --- a/extras/Package_tplwizstyles.mk +++ b/extras/Package_tplwizstyles.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles)) -$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_tplwizstyles,$(LIBO_SHARE_FOLDER)/template/common/wizard/styles,\ blackberry.ots \ black_white.ots \ diff --git a/extras/Package_wordbook.mk b/extras/Package_wordbook.mk index d844e692b98d..0923d0a55e78 100644 --- a/extras/Package_wordbook.mk +++ b/extras/Package_wordbook.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,extras_wordbook,$(SRCDIR)/extras/source/wordbook)) -$(eval $(call gb_Package_set_outdir,extras_wordbook,$(INSTROOT))) - $(eval $(call gb_Package_add_files,extras_wordbook,$(LIBO_SHARE_FOLDER)/wordbook,\ en-GB.dic \ en-US.dic \ diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk index aef359ae50df..6548fd6a1fd9 100644 --- a/filter/Package_docbook.mk +++ b/filter/Package_docbook.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook)) -$(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTROOT))) - $(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\ DocBookTemplate.stw \ docbooktosoffheadings.xsl \ diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk index fae4b030dd30..91f9ff9ac7ba 100644 --- a/filter/Package_xhtml.mk +++ b/filter/Package_xhtml.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt)) -$(eval $(call gb_Package_set_outdir,filter_xhtml,$(INSTROOT))) - $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl)) $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl)) $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl)) diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk index cedc3ba4ed84..314ff7abb0a9 100644 --- a/filter/Package_xslt.mk +++ b/filter/Package_xslt.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt)) -$(eval $(call gb_Package_set_outdir,filter_xslt,$(INSTROOT))) - $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/copy.xsl,common/copy.xsl)) $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/math.xsl,common/math.xsl)) $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl)) diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk index 1f4a40d8a4ca..50be1653ba2b 100644 --- a/framework/Package_dtd.mk +++ b/framework/Package_dtd.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd)) -$(eval $(call gb_Package_set_outdir,framework_dtd,$(INSTROOT))) - $(eval $(call gb_Package_add_files,framework_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\ accelerator.dtd \ event.dtd \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 24ebae895450..72016152f48b 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup))) -$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTROOT))) - $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,bootstrap) \ $(call gb_Helper_get_rcfile,fundamental) \ diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk index 96f246c17121..ce113ebe4dd5 100644 --- a/jvmfwk/Package_jreproperties.mk +++ b/jvmfwk/Package_jreproperties.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties))) -$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(INSTROOT))) - $(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class)) # vim:set noet sw=4 ts=4: diff --git a/jvmfwk/Package_jreproperties_solver.mk b/jvmfwk/Package_jreproperties_solver.mk index 4cecdcce845d..1a9b49b33a90 100644 --- a/jvmfwk/Package_jreproperties_solver.mk +++ b/jvmfwk/Package_jreproperties_solver.mk @@ -15,6 +15,8 @@ endif $(eval $(call gb_Package_Package,jvmfwk_jreproperties_solver,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties))) +$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_solver,$(OUTDIR))) + $(eval $(call gb_Package_add_file,jvmfwk_jreproperties_solver,$(jvmfwk_Package_jreproperties_solver_LIBDIR)/JREProperties.class,JREProperties.class)) # vim:set noet sw=4 ts=4: diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index 124dcfd80347..4500404e67ac 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk)) -$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTROOT))) - ifeq ($(OS),WNT) $(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) else ifeq ($(OS),FREEBSD) diff --git a/jvmfwk/Package_rcfiles_solver.mk b/jvmfwk/Package_rcfiles_solver.mk index 35716325ca14..6fc4a091c298 100644 --- a/jvmfwk/Package_rcfiles_solver.mk +++ b/jvmfwk/Package_rcfiles_solver.mk @@ -15,6 +15,8 @@ endif $(eval $(call gb_Package_Package,jvmfwk_rcfiles_solver,$(SRCDIR)/jvmfwk)) +$(eval $(call gb_Package_set_outdir,jvmfwk_rcfiles_solver,$(OUTDIR))) + $(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,jvmfwk3),source/jvmfwk3rc)) $(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) diff --git a/l10ntools/Package_ulfconv.mk b/l10ntools/Package_ulfconv.mk index 41337b26cb6e..18be8b410502 100644 --- a/l10ntools/Package_ulfconv.mk +++ b/l10ntools/Package_ulfconv.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,l10ntools_ulfconv,$(SRCDIR)/l10ntools/source/ulfconv)) +$(eval $(call gb_Package_set_outdir,l10ntools_ulfconv,$(OUTDIR))) + $(eval $(call gb_Package_add_file,l10ntools_ulfconv,bin/msi-encodinglist.txt,msi-encodinglist.txt)) # vim: set noet sw=4 ts=4: diff --git a/languagetool/Package_languagetool.mk b/languagetool/Package_languagetool.mk index 1738c868b884..a40a1e401e32 100644 --- a/languagetool/Package_languagetool.mk +++ b/languagetool/Package_languagetool.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,languagetool,$(call gb_UnpackedTarball_get_dir,languagetool))) +$(eval $(call gb_Package_set_outdir,languagetool,$(OUTDIR))) + $(eval $(call gb_Package_use_external_project,languagetool,languagetool)) $(eval $(call gb_Package_add_file,languagetool,bin/LanguageTool.oxt,dist/LanguageTool.oxt)) diff --git a/librelogo/Package_librelogo.mk b/librelogo/Package_librelogo.mk index bbb6d04b8250..4747a44e82e8 100644 --- a/librelogo/Package_librelogo.mk +++ b/librelogo/Package_librelogo.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,librelogo,$(SRCDIR)/librelogo/source)) -$(eval $(call gb_Package_set_outdir,librelogo,$(INSTROOT))) - $(eval $(call gb_Package_add_files,librelogo,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\ LibreLogo/LibreLogo.py \ pythonpath/LibreLogo_en_US.properties \ diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk index 902d3dcbfb4b..9e809af994a8 100644 --- a/librelogo/Package_librelogo_properties.mk +++ b/librelogo/Package_librelogo_properties.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,librelogo_properties,$(call gb_CustomTarget_get_workdir,librelogo/locproperties))) -$(eval $(call gb_Package_set_outdir,librelogo_properties,$(INSTROOT))) - $(eval $(call gb_Package_add_files,librelogo_properties,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\ $(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),LibreLogo_$(lang).properties) \ )) diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk index c3c517040b31..06c793863594 100644 --- a/libxmlsec/ExternalPackage_xmlsec.mk +++ b/libxmlsec/ExternalPackage_xmlsec.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec)) -$(eval $(call gb_ExternalPackage_set_outdir,xmlsec,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec)) ifeq ($(OS),WNT) diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index 664f8ac25870..054c7977984f 100644 --- a/nss/ExternalPackage_nss.mk +++ b/nss/ExternalPackage_nss.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss)) -$(eval $(call gb_ExternalPackage_set_outdir,nss,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,nss,nss)) ifeq ($(OS),MACOSX) diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk index 651994fd9486..bfe742c11423 100644 --- a/officecfg/Package_misc.mk +++ b/officecfg/Package_misc.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg)) -$(eval $(call gb_Package_set_outdir,officecfg_misc,$(INSTROOT))) - $(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) $(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) diff --git a/openssl/ExternalPackage_openssl.mk b/openssl/ExternalPackage_openssl.mk index 37a2a735a998..695c7b7119b6 100644 --- a/openssl/ExternalPackage_openssl.mk +++ b/openssl/ExternalPackage_openssl.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl)) -$(eval $(call gb_ExternalPackage_set_outdir,openssl,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl)) ifeq ($(COM),MSC) diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk index 0adcad89168b..68976380f6f7 100644 --- a/package/Package_dtd.mk +++ b/package/Package_dtd.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd)) -$(eval $(call gb_Package_set_outdir,package_dtd,$(INSTROOT))) - $(eval $(call gb_Package_add_file,package_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0/Manifest.dtd,Manifest.dtd)) # vim: set noet sw=4 ts=4: diff --git a/padmin/Package_padmin.mk b/padmin/Package_padmin.mk index 176577684660..e706f3f30643 100644 --- a/padmin/Package_padmin.mk +++ b/padmin/Package_padmin.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,padmin,$(SRCDIR)/padmin/source)) -$(eval $(call gb_Package_set_outdir,padmin,$(INSTROOT))) - $(eval $(call gb_Package_add_file,padmin,$(LIBO_BIN_FOLDER)/spadmin,spadmin.sh)) # vim: set noet sw=4 ts=4: diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk index 5a7c582bf36b..66fb0cdbc4b8 100644 --- a/postprocess/Package_images.mk +++ b/postprocess/Package_images.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images))) -$(eval $(call gb_Package_set_outdir,postprocess_images,$(INSTROOT))) - $(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\ $(if $(filter default,$(WITH_THEMES)),images.zip) \ $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \ diff --git a/postprocess/Package_registry.mk b/postprocess/Package_registry.mk index 371ef8f02824..9bab645fe0fe 100644 --- a/postprocess/Package_registry.mk +++ b/postprocess/Package_registry.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,postprocess_registry,$(patsubst %/,%,$(call gb_XcdTarget_get_target,)))) -$(eval $(call gb_Package_set_outdir,postprocess_registry,$(INSTROOT))) - $(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry,\ $(postprocess_XCDS) \ $(foreach lang,$(gb_Configuration_LANGS), \ diff --git a/psprint_config/Package_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk index 744a1bbeb704..781286f971ee 100644 --- a/psprint_config/Package_fontunxppds.mk +++ b/psprint_config/Package_fontunxppds.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds)) -$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTROOT))) - $(eval $(call gb_Package_add_files,psprint_config_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\ SGENPRT.PS \ SGENT42.PS \ diff --git a/psprint_config/Package_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk index f52ea7dadc21..ab0aaf7503d7 100644 --- a/psprint_config/Package_fontunxpsprint.mk +++ b/psprint_config/Package_fontunxpsprint.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration)) -$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTROOT))) - $(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,$(LIBO_SHARE_FOLDER)/psprint,\ psprint.conf \ )) diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index 4fefb89f8e80..ac8e856d9ad0 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3)) -$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) ifeq ($(OS)-$(COM),WNT-MSC) diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index 0a76e0249e92..80af45922d43 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source)) -$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTROOT))) - $(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\ loader/pythonloader.py \ module/uno.py \ diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk index 3f148417c231..e8c3fa6919e4 100644 --- a/pyuno/Package_python_shell.mk +++ b/pyuno/Package_python_shell.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell))) -$(eval $(call gb_Package_set_outdir,python_shell,$(INSTROOT))) - $(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh)) # vim: set noet sw=4 ts=4: diff --git a/pyuno/Package_zipcore.mk b/pyuno/Package_zipcore.mk index ad14792579e4..c3302910165c 100644 --- a/pyuno/Package_zipcore.mk +++ b/pyuno/Package_zipcore.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,python_zipcore,$(call gb_CustomTarget_get_workdir,pyuno/zipcore))) +$(error FIXME do not deliver this stuff to OUTDIR) + pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip $(eval $(call gb_Package_add_file,python_zipcore,bin/$(pyuno_PYTHON_ARCHIVE_NAME),$(pyuno_PYTHON_ARCHIVE_NAME))) diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index ad35b593bac3..19cf8fd68c29 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo)) +$(eval $(call gb_Package_set_outdir,readlicense_oo_files,$(OUTDIR))) + # LICENSE (upper case) is copied without EOL conversion from license.txt # license.txt is converted, prior to copy, see Package_license.mk $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE,txt/license.txt)) diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk index 9b460d94f8fb..877db2303a6b 100644 --- a/readlicense_oo/Package_license.mk +++ b/readlicense_oo/Package_license.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license))) +$(eval $(call gb_Package_set_outdir,readlicense_oo_license,$(OUTDIR))) + $(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt)) # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk index d0e86dd78bae..1e30ba364709 100644 --- a/readlicense_oo/Package_readme.mk +++ b/readlicense_oo/Package_readme.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme))) +$(eval $(call gb_Package_set_outdir,readlicense_oo_readme_inc,$(OUTDIR))) + $(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\ $(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\ $(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \ diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk index 53bcfe4ea312..c355105b51dc 100644 --- a/redland/ExternalPackage_raptor.mk +++ b/redland/ExternalPackage_raptor.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,raptor,raptor)) -$(eval $(call gb_ExternalPackage_set_outdir,raptor,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor)) ifeq ($(OS),MACOSX) diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk index 043a8ae5fdd8..85b47a17045d 100644 --- a/redland/ExternalPackage_rasqal.mk +++ b/redland/ExternalPackage_rasqal.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rasqal,rasqal)) -$(eval $(call gb_ExternalPackage_set_outdir,rasqal,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal)) ifeq ($(OS),MACOSX) diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk index ee241fb27aff..eb20b75e929e 100644 --- a/redland/ExternalPackage_redland.mk +++ b/redland/ExternalPackage_redland.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland)) -$(eval $(call gb_ExternalPackage_set_outdir,redland,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,redland,redland)) ifeq ($(OS),MACOSX) diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_reportbuilder-templates.mk index 4551df8bebd4..9f137763198f 100644 --- a/reportbuilder/Package_reportbuilder-templates.mk +++ b/reportbuilder/Package_reportbuilder-templates.mk @@ -14,8 +14,6 @@ $(eval $(call gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder/template)) -$(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,$(LIBO_SHARE_FOLDER)/template, \ common/wizard/report/default.otr \ )) diff --git a/rhino/ExternalPackage_rhino.mk b/rhino/ExternalPackage_rhino.mk index 7dc6fa6d157e..0ee1d60e309d 100644 --- a/rhino/ExternalPackage_rhino.mk +++ b/rhino/ExternalPackage_rhino.mk @@ -9,8 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino)) -$(eval $(call gb_ExternalPackage_set_outdir,rhino,$(INSTROOT))) - $(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino)) $(eval $(call gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/rhino1_5R5/js.jar)) diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk index b495566f9b1a..96e9701b46d1 100644 --- a/scripting/Package_ScriptsBeanShell.mk +++ b/scripting/Package_ScriptsBeanShell.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples)) -$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,$(LIBO_SHARE_FOLDER)/Scripts,\ beanshell/Capitalise/capitalise.bsh \ beanshell/Capitalise/parcel-descriptor.xml \ diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk index 241f220cf825..161efc519c51 100644 --- a/scripting/Package_ScriptsJavaScript.mk +++ b/scripting/Package_ScriptsJavaScript.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples)) -$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,$(LIBO_SHARE_FOLDER)/Scripts,\ javascript/ExportSheetsToHTML/exportsheetstohtml.js \ javascript/ExportSheetsToHTML/parcel-descriptor.xml \ diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk index b48c08d6a325..41027b04fd73 100644 --- a/scripting/Package_ScriptsPython.mk +++ b/scripting/Package_ScriptsPython.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples)) -$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\ python/Capitalise.py \ python/HelloWorld.py \ diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk index 1ecd5d6fbc18..bbaa6e2b77b0 100644 --- a/scripting/Package_java.mk +++ b/scripting/Package_java.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java)) -$(eval $(call gb_Package_set_outdir,scripting_java,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,scripting_java,$(LIBO_SHARE_FOLDER)/Scripts/java,\ HelloWorld/HelloWorld.java \ HelloWorld/parcel-descriptor.xml \ diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk index 9d2670b7e3f6..13ba07e8c608 100644 --- a/scripting/Package_java_jars.mk +++ b/scripting/Package_java_jars.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scripting_java_jars,$(WORKDIR)/Jar)) -$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTROOT))) - $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar)) $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/Highlight/Highlight.jar,Highlight.jar)) $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar)) diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk index 0d5f278f275f..84ae6c266caa 100644 --- a/scripting/Package_scriptbindinglib.mk +++ b/scripting/Package_scriptbindinglib.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings)) -$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTROOT))) - $(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\ Highlight.xdl \ dialog.xlb \ diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk index b946bcbb6648..f16758707ee7 100644 --- a/scripting/Package_scriptproviderforpython.mk +++ b/scripting/Package_scriptproviderforpython.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov)) -$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTROOT))) - $(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb)) $(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py)) diff --git a/sd/Package_opengl.mk b/sd/Package_opengl.mk index d3810b716922..ef03ab08f2af 100644 --- a/sd/Package_opengl.mk +++ b/sd/Package_opengl.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,sd_opengl,$(SRCDIR)/sd/xml)) -$(eval $(call gb_Package_set_outdir,sd_opengl,$(INSTROOT))) - $(eval $(call gb_Package_add_files,sd_opengl,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\ transitions-ogl.xml \ )) diff --git a/sd/Package_web.mk b/sd/Package_web.mk index 297373583b6e..62a8998641f7 100644 --- a/sd/Package_web.mk +++ b/sd/Package_web.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res)) -$(eval $(call gb_Package_set_outdir,sd_web,$(INSTROOT))) - $(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/webcast,\ webview/common.inc \ webview/common.pl \ diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk index 449252b2024e..fa227b72823c 100644 --- a/sd/Package_xml.mk +++ b/sd/Package_xml.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml)) -$(eval $(call gb_Package_set_outdir,sd_xml,$(INSTROOT))) - $(eval $(call gb_Package_add_files,sd_xml,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\ effects.xml \ transitions.xml \ diff --git a/sdext/Package_pdfimport_xpdfimport.mk b/sdext/Package_pdfimport_xpdfimport.mk index 09739ad9979d..9f08e05f4773 100644 --- a/sdext/Package_pdfimport_xpdfimport.mk +++ b/sdext/Package_pdfimport_xpdfimport.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,sdext_pdfimport_pdf,$(SRCDIR)/sdext)) -$(eval $(call gb_Package_set_outdir,sdext_pdfimport_pdf,$(INSTROOT))) - $(eval $(call gb_Package_add_file,sdext_pdfimport_pdf,$(LIBO_SHARE_FOLDER)/xpdfimport/xpdfimport_err.pdf,source/pdfimport/dialogs/xpdfimport_err.pdf)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index 9262fc62974d..f7cfa5b24fa6 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source)) +$(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/misc,bin/Info.plist.langpack,mac/Info.plist.langpack)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/ooo3_installer.icns,mac/ooo3_installer.icns)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store)) diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk index d0678105508e..786049354dbe 100644 --- a/setup_native/Package_packinfo.mk +++ b/setup_native/Package_packinfo.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/packinfo,$(SRCDIR)/setup_native/source/packinfo)) +$(eval $(call gb_Package_set_outdir,setup_native/packinfo,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/solariscopyrightfile,solariscopyrightfile)) $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/linuxcopyrightfile,linuxcopyrightfile)) $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/libreoffice.pcp,libreoffice.pcp)) diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk index db7c5bb7c329..e9447430500e 100644 --- a/setup_native/Package_scripts.mk +++ b/setup_native/Package_scripts.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/scripts,$(SRCDIR)/setup_native/scripts)) +$(eval $(call gb_Package_set_outdir,setup_native/scripts,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/scripts,bin/admin.pl,admin.pl)) $(eval $(call gb_Package_add_file,setup_native/scripts,bin/mac_install.script,mac_install.script)) $(eval $(call gb_Package_add_file,setup_native/scripts,bin/osx_install_languagepack.applescript,osx_install_languagepack.applescript)) diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk index ed4e59a556c4..ef157310fc4b 100644 --- a/setup_native/Package_scripts_generated.mk +++ b/setup_native/Package_scripts_generated.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts))) +$(eval $(call gb_Package_set_outdir,scripts_generated,$(OUTDIR))) + ifeq ($(OS),SOLARIS) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install)) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall)) diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk index f8aafabd5bfa..1f58bcabf86d 100644 --- a/setup_native/Package_ulf.mk +++ b/setup_native/Package_ulf.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/ulf,$(call gb_CustomTarget_get_workdir,setup_native/mac))) +$(eval $(call gb_Package_set_outdir,setup_native/ulf,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/ulf,bin/macinstall.ulf,macinstall.ulf)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_wintools.mk b/setup_native/Package_wintools.mk index 1c9919843c7e..5d9662e192e2 100644 --- a/setup_native/Package_wintools.mk +++ b/setup_native/Package_wintools.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native_wintools,$(call gb_CustomTarget_get_workdir,setup_native/wintools))) +$(error FIXME do not deliver this stuff to OUTDIR) + $(eval $(call gb_Package_add_files,setup_native_wintools,bin,\ makecab.exe \ msidb.exe \ diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk index 64e4fe386c32..e4f5a6efc5ec 100644 --- a/shell/Package_scripts.mk +++ b/shell/Package_scripts.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTROOT))) - $(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/open-url,open-url.sh)) ifeq ($(ENABLE_TDE),TRUE) diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk index 311f2c97b83d..794ed871e13d 100644 --- a/shell/Package_scripts_gnome.mk +++ b/shell/Package_scripts_gnome.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTROOT))) - $(eval $(call gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk index c53496302f84..c5e4978a4269 100644 --- a/shell/Package_scripts_kde.mk +++ b/shell/Package_scripts_kde.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTROOT))) - $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk index 455d2b3724e0..c09c9670ecb2 100644 --- a/shell/Package_senddoc.mk +++ b/shell/Package_senddoc.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,shell_senddoc,$(SRCDIR)/shell/source/unix/misc)) -$(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTROOT))) - $(eval $(call gb_Package_add_file,shell_senddoc,$(LIBO_BIN_FOLDER)/senddoc,senddoc.sh)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk index 24dc51c60531..aca8286af4f9 100644 --- a/solenv/Package_gdb.mk +++ b/solenv/Package_gdb.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb))) +$(eval $(call gb_Package_set_outdir,solenv_gdb,$(OUTDIR))) + # keep in sync with solenv/bin/install-gdb-printers $(eval $(call gb_Package_add_files,solenv_gdb,lib,\ $(if $(MERGELIBS), \ diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index febb505fa020..37b3e079c1de 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -85,7 +85,7 @@ $(call gb_Package_get_target,%) : # for other targets that want to create Packages, does not register at Module define gb_Package_Package_internal gb_Package_SOURCEDIR_$(1) := $(2) -gb_Package_OUTDIR_$(1) := $(OUTDIR) +gb_Package_OUTDIR_$(1) := $(INSTROOT) $(call gb_Package_get_target,$(1)) : FILES := $(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1)) $(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1)) @@ -113,7 +113,7 @@ endef # Set output dir for the package files. # -# Default is $(OUTDIR). +# Default is $(INSTROOT). # # gb_Package_set_outdir package outdir define gb_Package_set_outdir diff --git a/svx/Package_gengal.mk b/svx/Package_gengal.mk index 1a9b0a7c9671..ebc959a0f19e 100644 --- a/svx/Package_gengal.mk +++ b/svx/Package_gengal.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,svx_gengal,$(SRCDIR)/svx/source/gengal)) -$(eval $(call gb_Package_set_outdir,svx_gengal,$(INSTROOT))) - $(eval $(call gb_Package_add_file,svx_gengal,$(LIBO_BIN_FOLDER)/gengal,gengal.sh)) # vim: set noet ts=4 sw=4: diff --git a/sysui/Package_desktop.mk b/sysui/Package_desktop.mk index 64984a7283ca..0f0df9b03efb 100644 --- a/sysui/Package_desktop.mk +++ b/sysui/Package_desktop.mk @@ -11,6 +11,8 @@ include $(SRCDIR)/sysui/productlist.mk $(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget)) +$(eval $(call gb_Package_set_outdir,desktop,$(OUTDIR))) + ifneq ($(filter deb,$(PKGFORMAT)),) $(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/deb,\ $(foreach product,$(PRODUCTLIST),\ diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk index 2435b86e30d4..1b1c6a2463ce 100644 --- a/sysui/Package_icons.mk +++ b/sysui/Package_icons.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,sysui/icons,$(SRCDIR)/sysui/desktop/icons)) +$(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) + $(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) $(eval $(call gb_Package_add_files,sysui/icons,res/icons,\ diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk index 483a926a8227..2051da44b8d5 100644 --- a/sysui/Package_infoplist.mk +++ b/sysui/Package_infoplist.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,infoplist,$(call gb_CustomTarget_get_workdir,sysui/infoplist))) -$(eval $(call gb_Package_set_outdir,infoplist,$(INSTROOT))) - $(eval $(call gb_Package_add_files,infoplist,,\ PkgInfo \ Info.plist \ diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk index 117227b78de3..cd8343a6e893 100644 --- a/sysui/Package_osxicons.mk +++ b/sysui/Package_osxicons.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop/icons)) -$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\ text.icns \ oasis-text.icns \ diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk index 11122b4a26f2..3fa7cbeee59d 100644 --- a/sysui/Package_share.mk +++ b/sysui/Package_share.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,share,$(share_WORKDIR)/libreoffice)) -$(eval $(call gb_Package_set_outdir,share,$(INSTROOT))) - $(eval $(call gb_Package_add_files,share,share/xdg,\ $(addsuffix .desktop,$(LAUNCHERLIST)) \ )) diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index 2a992efd22c7..67dd84abd17a 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template)) +$(eval $(call gb_Package_set_outdir,test_unittest,$(OUTDIR))) + $(eval $(call gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/en-US.dic,user/wordbook/en-US.dic)) diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk index 8c019ece0263..5ca871afa0cc 100644 --- a/unoil/Package_clioootypesversion.mk +++ b/unoil/Package_clioootypesversion.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,unoil_clioootypesversion,$(SRCDIR)/unoil/climaker)) +$(eval $(call gb_Package_set_outdir,unoil_clioootypesversion,$(OUTDIR))) + $(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt)) # vim:set noet sw=4 ts=4: diff --git a/ure/Package_install.mk b/ure/Package_install.mk index 38b32401a3a6..94156b87ffb0 100644 --- a/ure/Package_install.mk +++ b/ure/Package_install.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source)) -$(eval $(call gb_Package_set_outdir,ure_install,$(INSTROOT))) - ifneq (WNT,$(OS)) ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),) $(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/startup.sh,startup.sh)) diff --git a/vcl/Package_osxres.mk b/vcl/Package_osxres.mk index 572b4b0e4d45..bc669eec5f50 100644 --- a/vcl/Package_osxres.mk +++ b/vcl/Package_osxres.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/aqua/source/res)) -$(eval $(call gb_Package_set_outdir,vcl_osxres,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\ MainMenu.nib/classes.nib \ MainMenu.nib/info.nib \ diff --git a/wizards/Package_access2base.mk b/wizards/Package_access2base.mk index d6a0e17242bf..2f551c139f62 100644 --- a/wizards/Package_access2base.mk +++ b/wizards/Package_access2base.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvaccess2base,$(SRCDIR)/wizards/source/access2base)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvaccess2base,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvaccess2base,$(LIBO_SHARE_FOLDER)/basic/Access2Base,\ _License.xba \ acConstants.xba \ diff --git a/wizards/Package_depot.mk b/wizards/Package_depot.mk index 081df3c67b10..bca72325db75 100644 --- a/wizards/Package_depot.mk +++ b/wizards/Package_depot.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvdepot,$(SRCDIR)/wizards/source/depot)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvdepot,$(LIBO_SHARE_FOLDER)/basic/Depot,\ CommonLang.xba \ Currency.xba \ diff --git a/wizards/Package_euro.mk b/wizards/Package_euro.mk index c3de389b97f4..415cb4714efa 100644 --- a/wizards/Package_euro.mk +++ b/wizards/Package_euro.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrveuro,$(SRCDIR)/wizards/source/euro)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrveuro,$(LIBO_SHARE_FOLDER)/basic/Euro,\ AutoPilotRun.xba \ Common.xba \ diff --git a/wizards/Package_form.mk b/wizards/Package_form.mk index 0a1f40dc4fe6..dd8325f1bfa9 100644 --- a/wizards/Package_form.mk +++ b/wizards/Package_form.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvform,$(SRCDIR)/wizards/source/formwizard)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvform,$(LIBO_SHARE_FOLDER)/basic/FormWizard,\ DBMeta.xba \ develop.xba \ diff --git a/wizards/Package_gimmicks.mk b/wizards/Package_gimmicks.mk index a3aab6986355..51aebb1c063b 100644 --- a/wizards/Package_gimmicks.mk +++ b/wizards/Package_gimmicks.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,$(LIBO_SHARE_FOLDER)/basic/Gimmicks,\ AutoText.xba \ ChangeAllChars.xba \ diff --git a/wizards/Package_import.mk b/wizards/Package_import.mk index 44743de2e144..ebe8d81697ce 100644 --- a/wizards/Package_import.mk +++ b/wizards/Package_import.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvimport,$(SRCDIR)/wizards/source/importwizard)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvimport,$(LIBO_SHARE_FOLDER)/basic/ImportWizard,\ API.xba \ dialog.xlb \ diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk index 4c60107f20c4..b24affad3720 100644 --- a/wizards/Package_share.mk +++ b/wizards/Package_share.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/configshare)) -$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\ dialog.xlc \ script.xlc \ diff --git a/wizards/Package_standard.mk b/wizards/Package_standard.mk index ac7d9ee8da75..abe56a232efd 100644 --- a/wizards/Package_standard.mk +++ b/wizards/Package_standard.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvstandard,$(SRCDIR)/wizards/source/standard)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvstandard,$(LIBO_SHARE_PRESETS_FOLDER)/basic/Standard,\ dialog.xlb \ Module1.xba \ diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk index cc07dc80a9fe..13728c7160a5 100644 --- a/wizards/Package_template.mk +++ b/wizards/Package_template.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/source/template)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)/basic/Template,\ Autotext.xba \ Correspondence.xba \ diff --git a/wizards/Package_tools.mk b/wizards/Package_tools.mk index ef0a0aa3d3d5..20bd5e73ef6d 100644 --- a/wizards/Package_tools.mk +++ b/wizards/Package_tools.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtools,$(SRCDIR)/wizards/source/tools)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvtools,$(LIBO_SHARE_FOLDER)/basic/Tools,\ Debug.xba \ dialog.xlb \ diff --git a/wizards/Package_tutorials.mk b/wizards/Package_tutorials.mk index 8520f5d09575..7accc846899f 100644 --- a/wizards/Package_tutorials.mk +++ b/wizards/Package_tutorials.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,$(LIBO_SHARE_FOLDER)/basic/Tutorials,\ dialog.xlb \ Functions.xba \ diff --git a/wizards/Package_usr.mk b/wizards/Package_usr.mk index a826784ee3d8..539de4944100 100644 --- a/wizards/Package_usr.mk +++ b/wizards/Package_usr.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/config)) -$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTROOT))) - $(eval $(call gb_Package_add_files,wizards_basicusr,$(LIBO_SHARE_PRESETS_FOLDER)/basic,\ dialog.xlc \ script.xlc \ diff --git a/xmlhelp/Package_helpxsl.mk b/xmlhelp/Package_helpxsl.mk index 1ed3adae8aa8..edb4dfbded78 100644 --- a/xmlhelp/Package_helpxsl.mk +++ b/xmlhelp/Package_helpxsl.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util)) -$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTROOT))) - $(eval $(call gb_Package_add_files,xmlhelp_helpxsl,$(LIBO_SHARE_HELP_FOLDER),\ idxcaption.xsl \ idxcontent.xsl \ diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk index c0b99554c524..78a7c9eb545d 100644 --- a/xmloff/Package_dtd.mk +++ b/xmloff/Package_dtd.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd)) -$(eval $(call gb_Package_set_outdir,xmloff_dtd,$(INSTROOT))) - $(eval $(call gb_Package_add_files,xmloff_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\ chart.mod \ datastyl.mod \ diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk index 13134846ad32..de8d0dec7ee2 100644 --- a/xmlscript/Package_dtd.mk +++ b/xmlscript/Package_dtd.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript)) -$(eval $(call gb_Package_set_outdir,xmlscript_dtd,$(INSTROOT))) - $(eval $(call gb_Package_add_files,xmlscript_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\ dtd/dialog.dtd \ dtd/libraries.dtd \ |