diff options
Diffstat (limited to 'external')
49 files changed, 14 insertions, 84 deletions
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) \ )) |