diff options
59 files changed, 66 insertions, 185 deletions
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk index 6a92937d88a8..753041cc9284 100644 --- a/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/apache-commons/ExternalProject_apache_commons_codec.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_codec)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec,apache_commons_codec)) $(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\ build \ diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk index aaf1520a6be6..314cdf293ce1 100644 --- a/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_httpclient,apache_commons_httpclient)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient,apache_commons_httpclient)) $(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-codec)) $(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-logging)) diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk index 283375eb8d2a..5b5b10326808 100644 --- a/apache-commons/ExternalProject_apache_commons_lang.mk +++ b/apache-commons/ExternalProject_apache_commons_lang.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_lang,apache_commons_lang)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang,apache_commons_lang)) $(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\ build \ diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk index 22ae742ef88c..11bf6bc7793f 100644 --- a/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/apache-commons/ExternalProject_apache_commons_logging.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) - -$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging)) +$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging,apache_commons_logging)) # TODO: this should go into RepositoryExternal.mk ifneq ($(SYSTEM_TOMCAT),YES) diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk index ce66dea81a97..2985ddded594 100644 --- a/beanshell/ExternalProject_beanshell.mk +++ b/beanshell/ExternalProject_beanshell.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,beanshell)) - -$(eval $(call gb_ExternalProject_use_unpacked,beanshell,beanshell)) +$(eval $(call gb_ExternalProject_ExternalProject,beanshell,beanshell)) $(eval $(call gb_ExternalProject_register_targets,beanshell,\ build \ diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 42a5c7f618bd..875a4bf2d99f 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,cairo)) - -$(eval $(call gb_ExternalProject_use_unpacked,cairo,cairo)) +$(eval $(call gb_ExternalProject_ExternalProject,cairo,cairo)) $(eval $(call gb_ExternalProject_use_external_project,cairo,pixman)) diff --git a/cairo/ExternalProject_pixman.mk b/cairo/ExternalProject_pixman.mk index c8cad9be625e..2bae7464ea38 100644 --- a/cairo/ExternalProject_pixman.mk +++ b/cairo/ExternalProject_pixman.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,pixman)) - -$(eval $(call gb_ExternalProject_use_unpacked,pixman,pixman)) +$(eval $(call gb_ExternalProject_ExternalProject,pixman,pixman)) $(eval $(call gb_ExternalProject_register_targets,pixman,\ build \ diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk index bb639963877b..8a94249da341 100644 --- a/cppunit/ExternalProject_cppunit.mk +++ b/cppunit/ExternalProject_cppunit.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,cppunit)) - -$(eval $(call gb_ExternalProject_use_unpacked,cppunit,cppunit)) +$(eval $(call gb_ExternalProject_ExternalProject,cppunit,cppunit)) $(eval $(call gb_ExternalProject_register_targets,cppunit,\ build \ diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index c56d9eeb6fe1..c5aa3fa2f11b 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,curl)) - -$(eval $(call gb_ExternalProject_use_unpacked,curl,curl)) +$(eval $(call gb_ExternalProject_ExternalProject,curl,curl)) $(eval $(call gb_ExternalProject_use_externals,curl,\ nss3 \ diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk index bfb46ba84395..826a5998f275 100644 --- a/epm/ExternalProject_epm.mk +++ b/epm/ExternalProject_epm.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,epm)) - -$(eval $(call gb_ExternalProject_use_unpacked,epm,epm)) +$(eval $(call gb_ExternalProject_ExternalProject,epm,epm)) $(eval $(call gb_ExternalProject_register_targets,epm,\ build \ diff --git a/expat/ExternalProject_expat.mk b/expat/ExternalProject_expat.mk index 6b5361c2e37a..47ea6ac52775 100644 --- a/expat/ExternalProject_expat.mk +++ b/expat/ExternalProject_expat.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,expat)) - -$(eval $(call gb_ExternalProject_use_unpacked,expat,expat)) +$(eval $(call gb_ExternalProject_ExternalProject,expat,expat)) $(eval $(call gb_ExternalProject_register_targets,expat,\ configure \ diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk index a09e9234e575..783fb4979a53 100644 --- a/fontconfig/ExternalProject_fontconfig.mk +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,fontconfig)) - -$(eval $(call gb_ExternalProject_use_unpacked,fontconfig,fontconfig)) +$(eval $(call gb_ExternalProject_ExternalProject,fontconfig,fontconfig)) $(eval $(call gb_ExternalProject_use_packages,fontconfig,\ freetype \ diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk index aa9c56c57ebd..ad8dc2e438c2 100644 --- a/freetype/ExternalProject_freetype.mk +++ b/freetype/ExternalProject_freetype.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,freetype)) - -$(eval $(call gb_ExternalProject_use_unpacked,freetype,freetype)) +$(eval $(call gb_ExternalProject_ExternalProject,freetype,freetype)) $(eval $(call gb_ExternalProject_register_targets,freetype,\ build \ diff --git a/harfbuzz/ExternalProject_harfbuzz.mk b/harfbuzz/ExternalProject_harfbuzz.mk index b82ec9772b00..9185c44cae06 100644 --- a/harfbuzz/ExternalProject_harfbuzz.mk +++ b/harfbuzz/ExternalProject_harfbuzz.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz)) - -$(eval $(call gb_ExternalProject_use_unpacked,harfbuzz,harfbuzz)) +$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz,harfbuzz)) $(eval $(call gb_ExternalProject_use_autoconf,harfbuzz,build)) diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk index 8cead357263b..1fff88103a53 100644 --- a/hsqldb/ExternalProject_hsqldb.mk +++ b/hsqldb/ExternalProject_hsqldb.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,hsqldb)) - -$(eval $(call gb_ExternalProject_use_unpacked,hsqldb,hsqldb)) +$(eval $(call gb_ExternalProject_ExternalProject,hsqldb,hsqldb)) $(eval $(call gb_ExternalProject_register_targets,hsqldb,\ build \ diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk index 569fb7ccf25b..d1b297fb322b 100644 --- a/hunspell/ExternalProject_hunspell.mk +++ b/hunspell/ExternalProject_hunspell.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,hunspell)) - -$(eval $(call gb_ExternalProject_use_unpacked,hunspell,hunspell)) +$(eval $(call gb_ExternalProject_ExternalProject,hunspell,hunspell)) $(eval $(call gb_ExternalProject_register_targets,hunspell,\ build \ diff --git a/hyphen/ExternalProject_hyphen.mk b/hyphen/ExternalProject_hyphen.mk index 31267294536b..b3a5272db0f8 100644 --- a/hyphen/ExternalProject_hyphen.mk +++ b/hyphen/ExternalProject_hyphen.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,hyphen)) - -$(eval $(call gb_ExternalProject_use_unpacked,hyphen,hyphen)) +$(eval $(call gb_ExternalProject_ExternalProject,hyphen,hyphen)) $(eval $(call gb_ExternalProject_use_package,hyphen,hunspell)) diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index 2df3011b15aa..3a20cd73aa19 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,icu)) - -$(eval $(call gb_ExternalProject_use_unpacked,icu,icu)) +$(eval $(call gb_ExternalProject_ExternalProject,icu,icu)) $(eval $(call gb_ExternalProject_register_targets,icu,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 23fd99b1265f..641497b65a99 100644 --- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flow_engine,jfreereport_flow_engine)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine,jfreereport_flow_engine)) $(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\ jfreereport_liblayout \ diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk index 7175f5dd8bb6..6332ec24c13a 100644 --- a/jfreereport/ExternalProject_jfreereport_flute.mk +++ b/jfreereport/ExternalProject_jfreereport_flute.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flute,jfreereport_flute)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute,jfreereport_flute)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk index 6b5cf6f0dcb2..f03ffc761133 100644 --- a/jfreereport/ExternalProject_jfreereport_libbase.mk +++ b/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libbase,jfreereport_libbase)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase,jfreereport_libbase)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk index 72e6fb171ea7..3c7474fbbe46 100644 --- a/jfreereport/ExternalProject_jfreereport_libfonts.mk +++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libfonts,jfreereport_libfonts)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts,jfreereport_libfonts)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk index b7f6d95b7c0d..5938cf45cdde 100644 --- a/jfreereport/ExternalProject_jfreereport_libformula.mk +++ b/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libformula,jfreereport_libformula)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula,jfreereport_libformula)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk index 4c5d79d1d05c..3c612e58b451 100644 --- a/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_liblayout,jfreereport_liblayout)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout,jfreereport_liblayout)) ifneq ($(SYSTEM_APACHE_COMMONS),YES) $(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\ diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk index dc3d8d8f1ca4..ffcf2d90a627 100644 --- a/jfreereport/ExternalProject_jfreereport_libloader.mk +++ b/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libloader,jfreereport_libloader)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader,jfreereport_libloader)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk index 215bd1ce90f8..e1c8b1923201 100644 --- a/jfreereport/ExternalProject_jfreereport_librepository.mk +++ b/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_librepository,jfreereport_librepository)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository,jfreereport_librepository)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk index 93cdfd5311fe..bc865bf2884d 100644 --- a/jfreereport/ExternalProject_jfreereport_libserializer.mk +++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libserializer,jfreereport_libserializer)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer,jfreereport_libserializer)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk index 93967f58cf41..068f08d8810f 100644 --- a/jfreereport/ExternalProject_jfreereport_libxml.mk +++ b/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -10,9 +10,7 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libxml,jfreereport_libxml)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml,jfreereport_libxml)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ build \ diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk index 750026887542..2f0b8d102000 100644 --- a/jfreereport/ExternalProject_jfreereport_sac.mk +++ b/jfreereport/ExternalProject_jfreereport_sac.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac)) - -$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_sac,jfreereport_sac)) +$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac,jfreereport_sac)) $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ build \ diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk index 3040689d2284..07ca3fa13219 100644 --- a/languagetool/ExternalProject_languagetool.mk +++ b/languagetool/ExternalProject_languagetool.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,languagetool)) - -$(eval $(call gb_ExternalProject_use_unpacked,languagetool,languagetool)) +$(eval $(call gb_ExternalProject_ExternalProject,languagetool,languagetool)) $(eval $(call gb_ExternalProject_register_targets,languagetool,\ build \ diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index dc77783cfb1b..825a2b361703 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,lcms2)) - -$(eval $(call gb_ExternalProject_use_unpacked,lcms2,lcms2)) +$(eval $(call gb_ExternalProject_ExternalProject,lcms2,lcms2)) $(eval $(call gb_ExternalProject_register_targets,lcms2,\ build \ diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index c6b834746d84..1a89d5846d28 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libcdr)) - -$(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr)) +$(eval $(call gb_ExternalProject_ExternalProject,libcdr,cdr)) $(eval $(call gb_ExternalProject_use_autoconf,libcdr,build)) diff --git a/libexttextcat/ExternalProject_exttextcat.mk b/libexttextcat/ExternalProject_exttextcat.mk index d9e5a2f31830..833cf1a9af29 100644 --- a/libexttextcat/ExternalProject_exttextcat.mk +++ b/libexttextcat/ExternalProject_exttextcat.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,exttextcat)) - -$(eval $(call gb_ExternalProject_use_unpacked,exttextcat,exttextcat)) +$(eval $(call gb_ExternalProject_ExternalProject,exttextcat,exttextcat)) $(eval $(call gb_ExternalProject_register_targets,exttextcat,\ build \ diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk index 9e344b9ce059..12e1a8dac0a1 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/liblangtag/ExternalProject_langtag.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,langtag)) - -$(eval $(call gb_ExternalProject_use_unpacked,langtag,langtag)) +$(eval $(call gb_ExternalProject_ExternalProject,langtag,langtag)) $(eval $(call gb_ExternalProject_use_external,langtag,libxml2)) diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 5534c7649606..a283a167013c 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libmspub)) - -$(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub)) +$(eval $(call gb_ExternalProject_ExternalProject,libmspub,mspub)) $(eval $(call gb_ExternalProject_use_autoconf,libmspub,build)) diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index 452dd9287304..b3881a946080 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/libmwaw/ExternalProject_libmwaw.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libmwaw)) - -$(eval $(call gb_ExternalProject_use_unpacked,libmwaw,mwaw)) +$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,mwaw)) $(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build)) diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk index e7b5fa37b01b..2b417ffc5be7 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/libodfgen/ExternalProject_libodfgen.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libodfgen)) - -$(eval $(call gb_ExternalProject_use_unpacked,libodfgen,odfgen)) +$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,odfgen)) $(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build)) diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 93cdcc4b03bd..80eb92620dbf 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,liborcus)) - -$(eval $(call gb_ExternalProject_use_unpacked,liborcus,orcus)) +$(eval $(call gb_ExternalProject_ExternalProject,liborcus,orcus)) $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build)) diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 6364a9e32d8a..961db683a8e2 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libvisio)) - -$(eval $(call gb_ExternalProject_use_unpacked,libvisio,visio)) +$(eval $(call gb_ExternalProject_ExternalProject,libvisio,visio)) $(eval $(call gb_ExternalProject_use_autoconf,libvisio,build)) diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index 0f20be7292f6..0f46cfd3551f 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libwpd)) - -$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd)) +$(eval $(call gb_ExternalProject_ExternalProject,libwpd,wpd)) $(eval $(call gb_ExternalProject_use_autoconf,libwpd,build)) diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index e9dc63878965..3f6522c6cd1f 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/libwpg/ExternalProject_libwpg.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libwpg)) - -$(eval $(call gb_ExternalProject_use_unpacked,libwpg,wpg)) +$(eval $(call gb_ExternalProject_ExternalProject,libwpg,wpg)) $(eval $(call gb_ExternalProject_use_autoconf,libwpg,build)) diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index ca0728d5169b..322d50a7b71c 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/libwps/ExternalProject_libwps.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,libwps)) - -$(eval $(call gb_ExternalProject_use_unpacked,libwps,wps)) +$(eval $(call gb_ExternalProject_ExternalProject,libwps,wps)) $(eval $(call gb_ExternalProject_use_autoconf,libwps,build)) diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk index 5ea4682c1b5a..cf7427ef9284 100644 --- a/libxml2/ExternalProject_xml2.mk +++ b/libxml2/ExternalProject_xml2.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,xml2)) - -$(eval $(call gb_ExternalProject_use_unpacked,xml2,xml2)) +$(eval $(call gb_ExternalProject_ExternalProject,xml2,xml2)) $(eval $(call gb_ExternalProject_register_targets,xml2,\ build \ diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index cefa967c1ad6..5dcc5abbf7a1 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,xmlsec)) - -$(eval $(call gb_ExternalProject_use_unpacked,xmlsec,xmlsec)) +$(eval $(call gb_ExternalProject_ExternalProject,xmlsec,xmlsec)) $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2)) diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk index 46af1bd13fae..0c2009d1ad09 100644 --- a/libxslt/ExternalProject_xslt.mk +++ b/libxslt/ExternalProject_xslt.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,xslt)) - -$(eval $(call gb_ExternalProject_use_unpacked,xslt,xslt)) +$(eval $(call gb_ExternalProject_ExternalProject,xslt,xslt)) $(eval $(call gb_ExternalProject_use_external,xslt,libxml2)) diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk index 0cf95dd2f4fe..50ca2717c246 100644 --- a/lpsolve/ExternalProject_lpsolve.mk +++ b/lpsolve/ExternalProject_lpsolve.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,lpsolve)) - -$(eval $(call gb_ExternalProject_use_unpacked,lpsolve,lpsolve)) +$(eval $(call gb_ExternalProject_ExternalProject,lpsolve,lpsolve)) $(eval $(call gb_ExternalProject_register_targets,lpsolve,\ build \ diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk index 99ccd61e3a29..8f2365c1c1a5 100644 --- a/mythes/ExternalProject_mythes.mk +++ b/mythes/ExternalProject_mythes.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,mythes)) - -$(eval $(call gb_ExternalProject_use_unpacked,mythes,mythes)) +$(eval $(call gb_ExternalProject_ExternalProject,mythes,mythes)) $(eval $(call gb_ExternalProject_use_package,mythes,hunspell)) diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index be1638544b9e..a0981bd1bf92 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,nss)) - -$(eval $(call gb_ExternalProject_use_unpacked,nss,nss)) +$(eval $(call gb_ExternalProject_ExternalProject,nss,nss)) $(eval $(call gb_ExternalProject_use_externals,nss,\ unistd_headers \ diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk index 396841fab446..943e91a542b8 100644 --- a/openldap/ExternalProject_openldap.mk +++ b/openldap/ExternalProject_openldap.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,openldap)) - -$(eval $(call gb_ExternalProject_use_unpacked,openldap,openldap)) +$(eval $(call gb_ExternalProject_ExternalProject,openldap,openldap)) $(eval $(call gb_ExternalProject_use_package,openldap,nss)) diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 266696537199..206e6bb4d460 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,openssl)) - -$(eval $(call gb_ExternalProject_use_unpacked,openssl,openssl)) +$(eval $(call gb_ExternalProject_ExternalProject,openssl,openssl)) $(eval $(call gb_ExternalProject_register_targets,openssl,\ build \ diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 63aa9434a2b0..d455d72f70a0 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,postgresql)) - -$(eval $(call gb_ExternalProject_use_unpacked,postgresql,postgresql)) +$(eval $(call gb_ExternalProject_ExternalProject,postgresql,postgresql)) $(eval $(call gb_ExternalProject_use_package,postgresql,openldap)) diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index c61e506516bc..d7346877e8a3 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,python3)) - -$(eval $(call gb_ExternalProject_use_unpacked,python3,python3)) +$(eval $(call gb_ExternalProject_ExternalProject,python3,python3)) $(eval $(call gb_ExternalProject_use_externals,python3,\ expat \ diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 9093d2d8d429..2bf01dbf4c7d 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,raptor)) - -$(eval $(call gb_ExternalProject_use_unpacked,raptor,raptor)) +$(eval $(call gb_ExternalProject_ExternalProject,raptor,raptor)) $(eval $(call gb_ExternalProject_use_external,raptor,libxml2)) diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 34761cc24e36..c136c13a1f41 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,rasqal)) - -$(eval $(call gb_ExternalProject_use_unpacked,rasqal,rasqal)) +$(eval $(call gb_ExternalProject_ExternalProject,rasqal,rasqal)) $(eval $(call gb_ExternalProject_use_external,rasqal,libxml2)) diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 1512d2a4ef21..4d6dcda2151c 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,redland)) - -$(eval $(call gb_ExternalProject_use_unpacked,redland,redland)) +$(eval $(call gb_ExternalProject_ExternalProject,redland,redland)) $(eval $(call gb_ExternalProject_use_packages,redland, \ raptor \ diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk index 16a678d7cc67..8f74c20fe48f 100644 --- a/rhino/ExternalProject_rhino.mk +++ b/rhino/ExternalProject_rhino.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,rhino)) - -$(eval $(call gb_ExternalProject_use_unpacked,rhino,rhino)) +$(eval $(call gb_ExternalProject_ExternalProject,rhino,rhino)) $(eval $(call gb_ExternalProject_register_targets,rhino,\ build \ diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 811a5d34c25d..e964610e6248 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -55,13 +55,16 @@ $(call gb_ExternalProject_get_clean_target,%) : $(call gb_ExternalProject_get_statedir,$*) \ ) -# Define a new external project +# Define a new external project, using an unpacked tarball # -# gb_ExternalProject_ExternalProject project +# gb_ExternalProject_ExternalProject project unpacked define gb_ExternalProject_ExternalProject -$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := +$(if $(2),,$(call gb_Output_error,gb_ExternalProject_ExternalProject: no unpacked parameter)) +$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(2)) $(call gb_ExternalProject_get_preparation_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir +$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(2)) +$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(2)) $(call gb_ExternalProject_get_target,$(1)) : $(call gb_ExternalProject_get_preparation_target,$(1)) $(call gb_ExternalProject_get_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir @@ -70,15 +73,9 @@ $(call gb_Helper_make_userfriendly_targets,$(1),ExternalProject) endef -# Use unpacked tarball as source for build -# -# gb_ExternalProject_use_unpacked project unpacked +# replaced by second parameter to ctor define gb_ExternalProject_use_unpacked -$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(2)) - -$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(2)) -$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(2)) - +$(call gb_Output_error,gb_ExternalProject_use_unpacked was removed) endef # Register a target in state directory diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk index 04e32730bf47..ffe58e76d243 100644 --- a/tomcat/ExternalProject_tomcat.mk +++ b/tomcat/ExternalProject_tomcat.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,tomcat)) - -$(eval $(call gb_ExternalProject_use_unpacked,tomcat,tomcat)) +$(eval $(call gb_ExternalProject_ExternalProject,tomcat,tomcat)) $(eval $(call gb_ExternalProject_register_targets,tomcat,\ build \ diff --git a/xpdf/ExternalProject_xpdf.mk b/xpdf/ExternalProject_xpdf.mk index bf147a956415..a8b540347f9f 100644 --- a/xpdf/ExternalProject_xpdf.mk +++ b/xpdf/ExternalProject_xpdf.mk @@ -7,9 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalProject_ExternalProject,xpdf)) - -$(eval $(call gb_ExternalProject_use_unpacked,xpdf,xpdf)) +$(eval $(call gb_ExternalProject_ExternalProject,xpdf,xpdf)) $(eval $(call gb_ExternalProject_register_targets,xpdf,\ build \ |