[Libreoffice-commits] core.git: 14 commits - apache-commons/ExternalProject_apache_commons_codec.mk apache-commons/ExternalProject_apache_commons_httpclient.mk apache-commons/ExternalProject_apache_commons_lang.mk apache-commons/ExternalProject_apache_commons_logging.mk beanshell/ExternalProject_beanshell.mk bluez_bluetooth/Makefile bluez_bluetooth/Module_bluez_bluetooth.mk bluez_bluetooth/Package_inc.mk cairo/ExternalProject_cairo.mk cairo/ExternalProject_pixman.mk cppunit/ExternalProject_cppunit.mk curl/ExternalProject_curl.mk dbaccess/Executable_odbcconfig.mk dbaccess/inc dbaccess/Library_dba.mk dbaccess/Library_dbmm.mk dbaccess/Library_sdbt.mk dbaccess/Module_dbaccess.mk dbaccess/Package_inc.mk dbaccess/source epm/ExternalProject_epm.mk expat/ExternalProject_expat.mk extensions/Library_npsoplugin.mk extensions/Library_pl.mk extensions/Library_scn.mk extensions/StaticLibrary_plugcon.mk fontconfig/ExternalProject_fontconfig.mk freetype/ExternalProject_freetype.mk harfbuzz/ExternalProjec t_harfbuzz.mk helpcompiler/Executable_helpindexer.mk helpcompiler/Executable_helplinker.mk helpcompiler/inc helpcompiler/Library_helplinker.mk helpcompiler/Module_helpcompiler.mk helpcompiler/Package_inc.mk helpcompiler/source hsqldb/ExternalProject_hsqldb.mk hunspell/ExternalProject_hunspell.mk hyphen/ExternalProject_hyphen.mk icu/ExternalProject_icu.mk include/dbaccess include/helpcompiler jfreereport/ExternalProject_jfreereport_flow_engine.mk jfreereport/ExternalProject_jfreereport_flute.mk jfreereport/ExternalProject_jfreereport_libbase.mk jfreereport/ExternalProject_jfreereport_libfonts.mk jfreereport/ExternalProject_jfreereport_libformula.mk jfreereport/ExternalProject_jfreereport_liblayout.mk jfreereport/ExternalProject_jfreereport_libloader.mk jfreereport/ExternalProject_jfreereport_librepository.mk jfreereport/ExternalProject_jfreereport_libserializer.mk jfreereport/ExternalProject_jfreereport_libxml.mk jfreereport/ExternalProject_jfreereport_sac.mk languagetool/Ext ernalProject_languagetool.mk lcms2/ExternalProject_lcms2.mk libcdr/ExternalPackage_libcdr.mk libcdr/ExternalProject_libcdr.mk libcdr/Module_libcdr.mk libcdr/UnpackedTarball_cdr.mk libcdr/UnpackedTarball_libcdr.mk libexttextcat/ExternalProject_exttextcat.mk liblangtag/ExternalProject_langtag.mk libmspub/ExternalPackage_libmspub.mk libmspub/ExternalProject_libmspub.mk libmspub/Module_libmspub.mk libmspub/UnpackedTarball_libmspub.mk libmspub/UnpackedTarball_mspub.mk libmwaw/ExternalPackage_libmwaw.mk libmwaw/ExternalProject_libmwaw.mk libmwaw/Module_libmwaw.mk libmwaw/UnpackedTarball_libmwaw.mk libmwaw/UnpackedTarball_mwaw.mk libodfgen/ExternalPackage_libodfgen.mk libodfgen/ExternalProject_libodfgen.mk libodfgen/Module_libodfgen.mk libodfgen/UnpackedTarball_libodfgen.mk libodfgen/UnpackedTarball_odfgen.mk liborcus/ExternalPackage_liborcus.mk liborcus/ExternalProject_liborcus.mk liborcus/Module_liborcus.mk liborcus/UnpackedTarball_liborcus.mk liborcus/UnpackedTarball_orcus.mk li bvisio/ExternalPackage_libvisio.mk libvisio/ExternalProject_libvisio.mk libvisio/Module_libvisio.mk libvisio/UnpackedTarball_libvisio.mk libvisio/UnpackedTarball_visio.mk libwpd/ExternalPackage_libwpd.mk libwpd/ExternalProject_libwpd.mk libwpd/Module_libwpd.mk libwpd/UnpackedTarball_libwpd.mk libwpd/UnpackedTarball_wpd.mk libwpg/ExternalPackage_libwpg.mk libwpg/ExternalProject_libwpg.mk libwpg/Module_libwpg.mk libwpg/UnpackedTarball_libwpg.mk libwpg/UnpackedTarball_wpg.mk libwps/ExternalPackage_libwps.mk libwps/ExternalProject_libwps.mk libwps/Module_libwps.mk libwps/UnpackedTarball_libwps.mk libwps/UnpackedTarball_wps.mk libxml2/ExternalProject_xml2.mk libxmlsec/ExternalProject_xmlsec.mk libxslt/ExternalProject_xslt.mk lpsolve/ExternalProject_lpsolve.mk Mesa/inc Mesa/Makefile Mesa/Module_Mesa.mk Mesa/Package_inc.mk mythes/ExternalProject_mythes.mk np_sdk/Module_np_sdk.mk np_sdk/mozsrc np_sdk/npsdk np_sdk/Package_inc.mk np_sdk/Package_npapi.mk np_sdk/StaticLibrary_nputils.mk nss/ExternalProject_nss.mk openldap/ExternalProject_openldap.mk openssl/ExternalProject_openssl.mk postgresql/ExternalProject_postgresql.mk python3/ExternalProject_python3.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk RepositoryExternal.mk RepositoryModule_host.mk rhino/ExternalProject_rhino.mk sane/inc sane/Makefile sane/Module_sane.mk sane/Package_inc.mk sd/Library_sd.mk solenv/gbuild tomcat/ExternalProject_tomcat.mk twain/inc twain/Makefile twain/Module_twain.mk twain/Package_inc.mk unixODBC/inc unixODBC/Makefile unixODBC/Module_unixODBC.mk unixODBC/Package_inc.mk x11_extensions/inc x11_extensions/Makefile x11_extensions/Module_x11_extensions.mk x11_extensions/Package_inc.mk xpdf/ExternalProject_xpdf.mk
Michael Stahl
mstahl at redhat.com
Mon May 6 16:45:57 PDT 2013
Mesa/Makefile | 7
Mesa/Module_Mesa.mk | 18
Mesa/Package_inc.mk | 23
Mesa/inc/GL/gl.h | 2252 +++
Mesa/inc/GL/gl_mangle.h | 1568 ++
Mesa/inc/GL/glext.h | 7271 ++++++++++++
Mesa/inc/GL/glu.h | 348
Mesa/inc/GL/glu_mangle.h | 86
Mesa/inc/GL/glx.h | 500
Mesa/inc/GL/glx_mangle.h | 81
Mesa/inc/GL/glxext.h | 785 +
Mesa/inc/GL/vms_x_fix.h | 1224 ++
Mesa/inc/GL/wglext.h | 943 +
Mesa/inc/gl.h | 2252 ---
Mesa/inc/gl_mangle.h | 1568 --
Mesa/inc/glext.h | 7271 ------------
Mesa/inc/glu.h | 348
Mesa/inc/glu_mangle.h | 86
Mesa/inc/glx.h | 500
Mesa/inc/glx_mangle.h | 81
Mesa/inc/glxext.h | 785 -
Mesa/inc/vms_x_fix.h | 1224 --
Mesa/inc/wglext.h | 943 -
RepositoryExternal.mk | 33
RepositoryModule_host.mk | 6
apache-commons/ExternalProject_apache_commons_codec.mk | 2
apache-commons/ExternalProject_apache_commons_httpclient.mk | 2
apache-commons/ExternalProject_apache_commons_lang.mk | 2
apache-commons/ExternalProject_apache_commons_logging.mk | 2
beanshell/ExternalProject_beanshell.mk | 2
bluez_bluetooth/Makefile | 7
bluez_bluetooth/Module_bluez_bluetooth.mk | 18
bluez_bluetooth/Package_inc.mk | 19
cairo/ExternalProject_cairo.mk | 2
cairo/ExternalProject_pixman.mk | 2
cppunit/ExternalProject_cppunit.mk | 2
curl/ExternalProject_curl.mk | 2
dbaccess/Executable_odbcconfig.mk | 5
dbaccess/Library_dba.mk | 2
dbaccess/Library_dbmm.mk | 4
dbaccess/Library_sdbt.mk | 5
dbaccess/Module_dbaccess.mk | 1
dbaccess/Package_inc.mk | 23
dbaccess/inc/AsyncronousLink.hxx | 64
dbaccess/inc/IController.hxx | 131
dbaccess/inc/IReference.hxx | 40
dbaccess/inc/ToolBoxHelper.hxx | 77
dbaccess/inc/controllerframe.hxx | 76
dbaccess/inc/dataview.hxx | 85
dbaccess/inc/dbaccessdllapi.h | 34
dbaccess/inc/dbaundomanager.hxx | 96
dbaccess/inc/dbsubcomponentcontroller.hxx | 204
dbaccess/inc/genericcontroller.hxx | 531
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 2
dbaccess/source/core/recovery/storagestream.hxx | 2
dbaccess/source/core/recovery/subcomponentloader.hxx | 2
dbaccess/source/core/recovery/subcomponents.hxx | 2
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 2
dbaccess/source/ui/app/AppView.cxx | 2
dbaccess/source/ui/app/AppView.hxx | 2
dbaccess/source/ui/app/IApplicationController.hxx | 2
dbaccess/source/ui/browser/AsyncronousLink.cxx | 2
dbaccess/source/ui/browser/dataview.cxx | 4
dbaccess/source/ui/browser/genericcontroller.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/inc/JoinDesignView.hxx | 2
dbaccess/source/ui/inc/TableDesignView.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 2
dbaccess/source/ui/inc/brwview.hxx | 2
dbaccess/source/ui/inc/indexdialog.hxx | 2
dbaccess/source/ui/inc/querycontainerwindow.hxx | 2
dbaccess/source/ui/inc/singledoccontroller.hxx | 2
dbaccess/source/ui/misc/TableCopyHelper.cxx | 4
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2
dbaccess/source/ui/misc/controllerframe.cxx | 4
dbaccess/source/ui/misc/dbaundomanager.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 4
dbaccess/source/ui/misc/singledoccontroller.cxx | 2
dbaccess/source/ui/misc/uiservices.cxx | 1
epm/ExternalProject_epm.mk | 2
expat/ExternalProject_expat.mk | 2
extensions/Library_npsoplugin.mk | 4
extensions/Library_pl.mk | 2
extensions/Library_scn.mk | 2
extensions/StaticLibrary_plugcon.mk | 4
fontconfig/ExternalProject_fontconfig.mk | 2
freetype/ExternalProject_freetype.mk | 2
harfbuzz/ExternalProject_harfbuzz.mk | 2
helpcompiler/Executable_helpindexer.mk | 6
helpcompiler/Executable_helplinker.mk | 5
helpcompiler/Library_helplinker.mk | 5
helpcompiler/Module_helpcompiler.mk | 1
helpcompiler/Package_inc.mk | 20
helpcompiler/inc/HelpIndexer.hxx | 89
helpcompiler/inc/HelpSearch.hxx | 44
helpcompiler/inc/compilehelp.hxx | 71
helpcompiler/inc/dllapi.h | 40
helpcompiler/source/BasCodeTagger.cxx | 2
helpcompiler/source/HelpCompiler.cxx | 4
helpcompiler/source/HelpLinker.cxx | 4
helpcompiler/source/HelpLinker_main.cxx | 4
hsqldb/ExternalProject_hsqldb.mk | 2
hunspell/ExternalProject_hunspell.mk | 2
hyphen/ExternalProject_hyphen.mk | 2
icu/ExternalProject_icu.mk | 2
include/dbaccess/AsyncronousLink.hxx | 64
include/dbaccess/IController.hxx | 131
include/dbaccess/IReference.hxx | 40
include/dbaccess/ToolBoxHelper.hxx | 77
include/dbaccess/controllerframe.hxx | 76
include/dbaccess/dataview.hxx | 85
include/dbaccess/dbaccessdllapi.h | 34
include/dbaccess/dbaundomanager.hxx | 96
include/dbaccess/dbsubcomponentcontroller.hxx | 204
include/dbaccess/genericcontroller.hxx | 531
include/helpcompiler/HelpIndexer.hxx | 89
include/helpcompiler/HelpSearch.hxx | 44
include/helpcompiler/compilehelp.hxx | 71
include/helpcompiler/dllapi.h | 40
jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2
jfreereport/ExternalProject_jfreereport_flute.mk | 2
jfreereport/ExternalProject_jfreereport_libbase.mk | 2
jfreereport/ExternalProject_jfreereport_libfonts.mk | 2
jfreereport/ExternalProject_jfreereport_libformula.mk | 2
jfreereport/ExternalProject_jfreereport_liblayout.mk | 2
jfreereport/ExternalProject_jfreereport_libloader.mk | 2
jfreereport/ExternalProject_jfreereport_librepository.mk | 2
jfreereport/ExternalProject_jfreereport_libserializer.mk | 2
jfreereport/ExternalProject_jfreereport_libxml.mk | 2
jfreereport/ExternalProject_jfreereport_sac.mk | 2
languagetool/ExternalProject_languagetool.mk | 2
lcms2/ExternalProject_lcms2.mk | 2
libcdr/ExternalPackage_libcdr.mk | 2
libcdr/ExternalProject_libcdr.mk | 2
libcdr/Module_libcdr.mk | 2
libcdr/UnpackedTarball_cdr.mk | 20
libcdr/UnpackedTarball_libcdr.mk | 20
libexttextcat/ExternalProject_exttextcat.mk | 2
liblangtag/ExternalProject_langtag.mk | 2
libmspub/ExternalPackage_libmspub.mk | 2
libmspub/ExternalProject_libmspub.mk | 2
libmspub/Module_libmspub.mk | 2
libmspub/UnpackedTarball_libmspub.mk | 14
libmspub/UnpackedTarball_mspub.mk | 14
libmwaw/ExternalPackage_libmwaw.mk | 2
libmwaw/ExternalProject_libmwaw.mk | 2
libmwaw/Module_libmwaw.mk | 2
libmwaw/UnpackedTarball_libmwaw.mk | 21
libmwaw/UnpackedTarball_mwaw.mk | 21
libodfgen/ExternalPackage_libodfgen.mk | 2
libodfgen/ExternalProject_libodfgen.mk | 2
libodfgen/Module_libodfgen.mk | 2
libodfgen/UnpackedTarball_libodfgen.mk | 20
libodfgen/UnpackedTarball_odfgen.mk | 20
liborcus/ExternalPackage_liborcus.mk | 2
liborcus/ExternalProject_liborcus.mk | 2
liborcus/Module_liborcus.mk | 2
liborcus/UnpackedTarball_liborcus.mk | 37
liborcus/UnpackedTarball_orcus.mk | 37
libvisio/ExternalPackage_libvisio.mk | 2
libvisio/ExternalProject_libvisio.mk | 2
libvisio/Module_libvisio.mk | 2
libvisio/UnpackedTarball_libvisio.mk | 15
libvisio/UnpackedTarball_visio.mk | 15
libwpd/ExternalPackage_libwpd.mk | 2
libwpd/ExternalProject_libwpd.mk | 2
libwpd/Module_libwpd.mk | 2
libwpd/UnpackedTarball_libwpd.mk | 14
libwpd/UnpackedTarball_wpd.mk | 22
libwpg/ExternalPackage_libwpg.mk | 2
libwpg/ExternalProject_libwpg.mk | 2
libwpg/Module_libwpg.mk | 2
libwpg/UnpackedTarball_libwpg.mk | 14
libwpg/UnpackedTarball_wpg.mk | 14
libwps/ExternalPackage_libwps.mk | 2
libwps/ExternalProject_libwps.mk | 2
libwps/Module_libwps.mk | 2
libwps/UnpackedTarball_libwps.mk | 14
libwps/UnpackedTarball_wps.mk | 14
libxml2/ExternalProject_xml2.mk | 2
libxmlsec/ExternalProject_xmlsec.mk | 2
libxslt/ExternalProject_xslt.mk | 2
lpsolve/ExternalProject_lpsolve.mk | 2
mythes/ExternalProject_mythes.mk | 2
np_sdk/Module_np_sdk.mk | 10
np_sdk/Package_inc.mk | 18
np_sdk/Package_npapi.mk | 18
np_sdk/StaticLibrary_nputils.mk | 4
np_sdk/mozsrc/LEGAL | 43
np_sdk/mozsrc/LICENSE | 567
np_sdk/mozsrc/README | 2
np_sdk/mozsrc/jri.h | 689 -
np_sdk/mozsrc/jri_md.h | 545
np_sdk/mozsrc/jritypes.h | 232
np_sdk/mozsrc/npunix.c | 507
np_sdk/mozsrc/npupp.h | 1267 --
np_sdk/mozsrc/npwin.cxx | 358
np_sdk/mozsrc/plugin.h | 44
np_sdk/npsdk/LEGAL | 43
np_sdk/npsdk/LICENSE | 567
np_sdk/npsdk/README | 2
np_sdk/npsdk/jri.h | 689 +
np_sdk/npsdk/jri_md.h | 545
np_sdk/npsdk/jritypes.h | 232
np_sdk/npsdk/npunix.c | 507
np_sdk/npsdk/npupp.h | 1267 ++
np_sdk/npsdk/npwin.cxx | 358
np_sdk/npsdk/plugin.h | 44
nss/ExternalProject_nss.mk | 2
openldap/ExternalProject_openldap.mk | 2
openssl/ExternalProject_openssl.mk | 2
postgresql/ExternalProject_postgresql.mk | 2
python3/ExternalProject_python3.mk | 2
redland/ExternalProject_raptor.mk | 2
redland/ExternalProject_rasqal.mk | 2
redland/ExternalProject_redland.mk | 2
rhino/ExternalProject_rhino.mk | 2
sane/Makefile | 7
sane/Module_sane.mk | 19
sane/Package_inc.mk | 14
sane/inc/sane.h | 213
sane/inc/sane/sane.h | 213
sd/Library_sd.mk | 5
solenv/gbuild/ExternalProject.mk | 33
tomcat/ExternalProject_tomcat.mk | 2
twain/Makefile | 7
twain/Module_twain.mk | 17
twain/Package_inc.mk | 14
twain/inc/twain.h | 2010 ---
twain/inc/twain/twain.h | 2010 +++
unixODBC/Makefile | 7
unixODBC/Module_unixODBC.mk | 22
unixODBC/Package_inc.mk | 17
unixODBC/inc/odbc/sql.h | 824 +
unixODBC/inc/odbc/sqlext.h | 2122 +++
unixODBC/inc/odbc/sqltypes.h | 471
unixODBC/inc/odbc/sqlucode.h | 789 +
unixODBC/inc/sql.h | 824 -
unixODBC/inc/sqlext.h | 2122 ---
unixODBC/inc/sqltypes.h | 471
unixODBC/inc/sqlucode.h | 789 -
x11_extensions/Makefile | 7
x11_extensions/Module_x11_extensions.mk | 16
x11_extensions/Package_inc.mk | 21
x11_extensions/inc/X11/extensions/Xrandr.h | 151
x11_extensions/inc/X11/extensions/Xrender.h | 528
x11_extensions/inc/X11/extensions/randr.h | 74
x11_extensions/inc/X11/extensions/randrproto.h | 209
x11_extensions/inc/X11/extensions/render.h | 189
x11_extensions/inc/X11/extensions/renderproto.h | 663 +
x11_extensions/inc/X11/extensions/shape.h | 155
x11_extensions/inc/X11/extensions/shapeconst.h | 55
x11_extensions/inc/Xrandr.h | 151
x11_extensions/inc/Xrender.h | 528
x11_extensions/inc/randr.h | 74
x11_extensions/inc/randrproto.h | 209
x11_extensions/inc/render.h | 189
x11_extensions/inc/renderproto.h | 663 -
x11_extensions/inc/shape.h | 155
x11_extensions/inc/shapeconst.h | 55
xpdf/ExternalProject_xpdf.mk | 2
264 files changed, 29627 insertions(+), 30122 deletions(-)
New commits:
commit 7858c0f7881fea439b0701482d3a95d73e0f3cb1
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue May 7 00:06:50 2013 +0200
gbuild: ExternalProject: always build externals from scratch
It could happen that externals were built incrementally, in case
something the ExternalProject depends on was updated. To prevent this,
change the dependencies so that the UnpackedTarball is unpacked again
when the ExternalProject's dependencies are newer. This is possible
without introducing a new target for the purpose due to the refactorings
in previous commits that enforce the name of UnpackedTarball.
Change-Id: Ie7a84064ec2ffc76175cd2b7792517e68664a461
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 5031b52..1749e9ac 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -19,6 +19,19 @@
# Package is sufficient if no files--e.g., headers--from the unpacked
# tarball need to be delivered.)
#
+# An ExternalProject always uses one UnpackedTarball with the same name.
+# The dependency strucure ensures that any change on a dependency
+# of the ExternalProject will cause the UnpackedTarball to be unpacked
+# again, so the ExternalProject always does a clean build and is not at
+# the mercy of the external's build system's dubious incremental builds.
+#
+# ExternalProject target
+# => ExternalProject state target(s) (these actually build stuff)
+# => UnpackedTarball target (unpack the tarball)
+# => UnpackedTarball prepare target
+# => ExternalProject prepare target
+# => stuff the external depends upon
+#
# ExternalProject has no gbuild abstraction for actually building the
# external code, so it is necessary to define rule(s) and recipe(s) to
# handle it. It does not matter if there are several rules handling
@@ -62,9 +75,9 @@ define gb_ExternalProject_ExternalProject
$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(1))
$(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,$(1))
+$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(call gb_ExternalProject_get_preparation_target,$(1))
$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(1))
-$(call gb_ExternalProject_get_target,$(1)) : $(call gb_ExternalProject_get_preparation_target,$(1))
+$(call gb_ExternalProject_get_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(1))
$(call gb_ExternalProject_get_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir
$$(eval $$(call gb_Module_register_target,$(call gb_ExternalProject_get_target,$(1)),$(call gb_ExternalProject_get_clean_target,$(1))))
@@ -87,7 +100,7 @@ endef
# gb_ExternalProject_register_target project target
define gb_ExternalProject_register_target
$(call gb_ExternalProject_get_target,$(1)) : $(call gb_ExternalProject_get_state_target,$(1),$(2))
-$(call gb_ExternalProject_get_state_target,$(1),$(2)) : $(call gb_ExternalProject_get_preparation_target,$(1))
+$(call gb_ExternalProject_get_state_target,$(1),$(2)) : $(call gb_UnpackedTarball_get_target,$(1))
$(call gb_ExternalProject_get_state_target,$(1),$(2)) :| $(dir $(call gb_ExternalProject_get_state_target,$(1),$(2))).dir
endef
commit 1a1f1fbdf035d731a2a26fa8eeeac1195181e9fe
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 6 23:46:30 2013 +0200
gbuild: ExternalProject: remove second parameter again...
... now that everything is consistent.
Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
index 753041c..2135cb4 100644
--- a/apache-commons/ExternalProject_apache_commons_codec.mk
+++ b/apache-commons/ExternalProject_apache_commons_codec.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec,apache_commons_codec))
+$(eval $(call gb_ExternalProject_ExternalProject,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 314cdf2..4c02459 100644
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient,apache_commons_httpclient))
+$(eval $(call gb_ExternalProject_ExternalProject,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 5b5b1032..aadd733 100644
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang,apache_commons_lang))
+$(eval $(call gb_ExternalProject_ExternalProject,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 11bf6bc..98a77eb 100644
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging,apache_commons_logging))
+$(eval $(call gb_ExternalProject_ExternalProject,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 2985ddd..889b79b 100644
--- a/beanshell/ExternalProject_beanshell.mk
+++ b/beanshell/ExternalProject_beanshell.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,beanshell,beanshell))
+$(eval $(call gb_ExternalProject_ExternalProject,beanshell))
$(eval $(call gb_ExternalProject_register_targets,beanshell,\
build \
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 875a4bf..e27bf37 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,cairo,cairo))
+$(eval $(call gb_ExternalProject_ExternalProject,cairo))
$(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
diff --git a/cairo/ExternalProject_pixman.mk b/cairo/ExternalProject_pixman.mk
index 2bae746..80e62fa 100644
--- a/cairo/ExternalProject_pixman.mk
+++ b/cairo/ExternalProject_pixman.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,pixman,pixman))
+$(eval $(call gb_ExternalProject_ExternalProject,pixman))
$(eval $(call gb_ExternalProject_register_targets,pixman,\
build \
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index 8a94249..e4a3cb1 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,cppunit,cppunit))
+$(eval $(call gb_ExternalProject_ExternalProject,cppunit))
$(eval $(call gb_ExternalProject_register_targets,cppunit,\
build \
diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index c5aa3fa..23dce11 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,curl,curl))
+$(eval $(call gb_ExternalProject_ExternalProject,curl))
$(eval $(call gb_ExternalProject_use_externals,curl,\
nss3 \
diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk
index 826a599..ca0c298 100644
--- a/epm/ExternalProject_epm.mk
+++ b/epm/ExternalProject_epm.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,epm,epm))
+$(eval $(call gb_ExternalProject_ExternalProject,epm))
$(eval $(call gb_ExternalProject_register_targets,epm,\
build \
diff --git a/expat/ExternalProject_expat.mk b/expat/ExternalProject_expat.mk
index 47ea6ac..2fdaf5e 100644
--- a/expat/ExternalProject_expat.mk
+++ b/expat/ExternalProject_expat.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,expat,expat))
+$(eval $(call gb_ExternalProject_ExternalProject,expat))
$(eval $(call gb_ExternalProject_register_targets,expat,\
configure \
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index 783fb49..f4584f0 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,fontconfig,fontconfig))
+$(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
$(eval $(call gb_ExternalProject_use_packages,fontconfig,\
freetype \
diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk
index ad8dc2e..8e2108c 100644
--- a/freetype/ExternalProject_freetype.mk
+++ b/freetype/ExternalProject_freetype.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,freetype,freetype))
+$(eval $(call gb_ExternalProject_ExternalProject,freetype))
$(eval $(call gb_ExternalProject_register_targets,freetype,\
build \
diff --git a/harfbuzz/ExternalProject_harfbuzz.mk b/harfbuzz/ExternalProject_harfbuzz.mk
index 9185c44..d0a405f 100644
--- a/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/harfbuzz/ExternalProject_harfbuzz.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz,harfbuzz))
+$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz))
$(eval $(call gb_ExternalProject_use_autoconf,harfbuzz,build))
diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk
index 1fff881..c32a2bf 100644
--- a/hsqldb/ExternalProject_hsqldb.mk
+++ b/hsqldb/ExternalProject_hsqldb.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,hsqldb,hsqldb))
+$(eval $(call gb_ExternalProject_ExternalProject,hsqldb))
$(eval $(call gb_ExternalProject_register_targets,hsqldb,\
build \
diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk
index d1b297f..6bbb618 100644
--- a/hunspell/ExternalProject_hunspell.mk
+++ b/hunspell/ExternalProject_hunspell.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,hunspell,hunspell))
+$(eval $(call gb_ExternalProject_ExternalProject,hunspell))
$(eval $(call gb_ExternalProject_register_targets,hunspell,\
build \
diff --git a/hyphen/ExternalProject_hyphen.mk b/hyphen/ExternalProject_hyphen.mk
index b3a5272..1afb444 100644
--- a/hyphen/ExternalProject_hyphen.mk
+++ b/hyphen/ExternalProject_hyphen.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,hyphen,hyphen))
+$(eval $(call gb_ExternalProject_ExternalProject,hyphen))
$(eval $(call gb_ExternalProject_use_package,hyphen,hunspell))
diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 3a20cd7..5ec0933 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,icu,icu))
+$(eval $(call gb_ExternalProject_ExternalProject,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 641497b..08b8613 100644
--- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine,jfreereport_flow_engine))
+$(eval $(call gb_ExternalProject_ExternalProject,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 6332ec2..90e59d6 100644
--- a/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalProject_ExternalProject,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 f03ffc761..0f1c2ac 100644
--- a/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase,jfreereport_libbase))
+$(eval $(call gb_ExternalProject_ExternalProject,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 3c7474f..0982ed7 100644
--- a/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts,jfreereport_libfonts))
+$(eval $(call gb_ExternalProject_ExternalProject,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 5938cf4..9523a0f 100644
--- a/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula,jfreereport_libformula))
+$(eval $(call gb_ExternalProject_ExternalProject,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 3c612e5..cddbef1 100644
--- a/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout,jfreereport_liblayout))
+$(eval $(call gb_ExternalProject_ExternalProject,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 ffcf2d9..6b3c01b 100644
--- a/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader,jfreereport_libloader))
+$(eval $(call gb_ExternalProject_ExternalProject,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 e1c8b19..4f1a50e 100644
--- a/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository,jfreereport_librepository))
+$(eval $(call gb_ExternalProject_ExternalProject,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 bc865bf..6bc29f7 100644
--- a/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer,jfreereport_libserializer))
+$(eval $(call gb_ExternalProject_ExternalProject,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 068f08d..c7340d5 100644
--- a/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -10,7 +10,7 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml,jfreereport_libxml))
+$(eval $(call gb_ExternalProject_ExternalProject,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 2f0b8d1..72783a1 100644
--- a/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac,jfreereport_sac))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac))
$(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
build \
diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk
index 07ca3fa..fdee1ad 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,languagetool,languagetool))
+$(eval $(call gb_ExternalProject_ExternalProject,languagetool))
$(eval $(call gb_ExternalProject_register_targets,languagetool,\
build \
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 825a2b3..1689482 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,lcms2,lcms2))
+$(eval $(call gb_ExternalProject_ExternalProject,lcms2))
$(eval $(call gb_ExternalProject_register_targets,lcms2,\
build \
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f71408e..f877cba 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libcdr,libcdr))
+$(eval $(call gb_ExternalProject_ExternalProject,libcdr))
$(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
diff --git a/libexttextcat/ExternalProject_exttextcat.mk b/libexttextcat/ExternalProject_exttextcat.mk
index 833cf1a..67f70fc 100644
--- a/libexttextcat/ExternalProject_exttextcat.mk
+++ b/libexttextcat/ExternalProject_exttextcat.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,exttextcat,exttextcat))
+$(eval $(call gb_ExternalProject_ExternalProject,exttextcat))
$(eval $(call gb_ExternalProject_register_targets,exttextcat,\
build \
diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index 12e1a8d..9b83a1b 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,langtag,langtag))
+$(eval $(call gb_ExternalProject_ExternalProject,langtag))
$(eval $(call gb_ExternalProject_use_external,langtag,libxml2))
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
index 3e28ba2..3a0ab0a 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libmspub,libmspub))
+$(eval $(call gb_ExternalProject_ExternalProject,libmspub))
$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk
index 52e23ce..82b4a3d 100644
--- a/libmwaw/ExternalProject_libmwaw.mk
+++ b/libmwaw/ExternalProject_libmwaw.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,libmwaw))
+$(eval $(call gb_ExternalProject_ExternalProject,libmwaw))
$(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk
index 9d34e06..3b0ce21 100644
--- a/libodfgen/ExternalProject_libodfgen.mk
+++ b/libodfgen/ExternalProject_libodfgen.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,libodfgen))
+$(eval $(call gb_ExternalProject_ExternalProject,libodfgen))
$(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build))
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index df8b494..5d11237 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus,liborcus))
+$(eval $(call gb_ExternalProject_ExternalProject,liborcus))
$(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 9ef2a84f..3a5ce50 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libvisio,libvisio))
+$(eval $(call gb_ExternalProject_ExternalProject,libvisio))
$(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index 9759fc4..8fb4a8c 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd,libwpd))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk
index 0a0b6bc..226474c 100644
--- a/libwpg/ExternalProject_libwpg.mk
+++ b/libwpg/ExternalProject_libwpg.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libwpg,libwpg))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpg))
$(eval $(call gb_ExternalProject_use_autoconf,libwpg,build))
diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk
index 0cccf2c..ba1bdb0 100644
--- a/libwps/ExternalProject_libwps.mk
+++ b/libwps/ExternalProject_libwps.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libwps,libwps))
+$(eval $(call gb_ExternalProject_ExternalProject,libwps))
$(eval $(call gb_ExternalProject_use_autoconf,libwps,build))
diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index cf7427e..d518a7f 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,xml2,xml2))
+$(eval $(call gb_ExternalProject_ExternalProject,xml2))
$(eval $(call gb_ExternalProject_register_targets,xml2,\
build \
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 5dcc5ab..31b9fd9 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,xmlsec,xmlsec))
+$(eval $(call gb_ExternalProject_ExternalProject,xmlsec))
$(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index 0c2009d..fa13770 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,xslt,xslt))
+$(eval $(call gb_ExternalProject_ExternalProject,xslt))
$(eval $(call gb_ExternalProject_use_external,xslt,libxml2))
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
index 50ca271..55da704 100644
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,lpsolve,lpsolve))
+$(eval $(call gb_ExternalProject_ExternalProject,lpsolve))
$(eval $(call gb_ExternalProject_register_targets,lpsolve,\
build \
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 8f2365c..7eb367b 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,mythes,mythes))
+$(eval $(call gb_ExternalProject_ExternalProject,mythes))
$(eval $(call gb_ExternalProject_use_package,mythes,hunspell))
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index a0981bd..c62861a 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,nss,nss))
+$(eval $(call gb_ExternalProject_ExternalProject,nss))
$(eval $(call gb_ExternalProject_use_externals,nss,\
unistd_headers \
diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
index 943e91a..8596354 100644
--- a/openldap/ExternalProject_openldap.mk
+++ b/openldap/ExternalProject_openldap.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,openldap,openldap))
+$(eval $(call gb_ExternalProject_ExternalProject,openldap))
$(eval $(call gb_ExternalProject_use_package,openldap,nss))
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index 206e6bb..433d494 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,openssl,openssl))
+$(eval $(call gb_ExternalProject_ExternalProject,openssl))
$(eval $(call gb_ExternalProject_register_targets,openssl,\
build \
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index d455d72f..76d5a01 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,postgresql,postgresql))
+$(eval $(call gb_ExternalProject_ExternalProject,postgresql))
$(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index d734687..b8953c7 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,python3,python3))
+$(eval $(call gb_ExternalProject_ExternalProject,python3))
$(eval $(call gb_ExternalProject_use_externals,python3,\
expat \
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 2bf01db..88b8a0e 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,raptor,raptor))
+$(eval $(call gb_ExternalProject_ExternalProject,raptor))
$(eval $(call gb_ExternalProject_use_external,raptor,libxml2))
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index c136c13..9277d07 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,rasqal,rasqal))
+$(eval $(call gb_ExternalProject_ExternalProject,rasqal))
$(eval $(call gb_ExternalProject_use_external,rasqal,libxml2))
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 4d6dcda..6034534 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,redland,redland))
+$(eval $(call gb_ExternalProject_ExternalProject,redland))
$(eval $(call gb_ExternalProject_use_packages,redland, \
raptor \
diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk
index 8f74c20..3243ad9 100644
--- a/rhino/ExternalProject_rhino.mk
+++ b/rhino/ExternalProject_rhino.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,rhino,rhino))
+$(eval $(call gb_ExternalProject_ExternalProject,rhino))
$(eval $(call gb_ExternalProject_register_targets,rhino,\
build \
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index e964610..5031b52 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -55,16 +55,15 @@ $(call gb_ExternalProject_get_clean_target,%) :
$(call gb_ExternalProject_get_statedir,$*) \
)
-# Define a new external project, using an unpacked tarball
+# Define a new external project, using an unpacked tarball of the same name
#
-# gb_ExternalProject_ExternalProject project unpacked
+# gb_ExternalProject_ExternalProject project
define gb_ExternalProject_ExternalProject
-$(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_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(1))
$(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_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(1))
+$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(1))
$(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
diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk
index ffe58e7..0640f4b 100644
--- a/tomcat/ExternalProject_tomcat.mk
+++ b/tomcat/ExternalProject_tomcat.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,tomcat,tomcat))
+$(eval $(call gb_ExternalProject_ExternalProject,tomcat))
$(eval $(call gb_ExternalProject_register_targets,tomcat,\
build \
diff --git a/xpdf/ExternalProject_xpdf.mk b/xpdf/ExternalProject_xpdf.mk
index a8b5403..f7cb13c 100644
--- a/xpdf/ExternalProject_xpdf.mk
+++ b/xpdf/ExternalProject_xpdf.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,xpdf,xpdf))
+$(eval $(call gb_ExternalProject_ExternalProject,xpdf))
$(eval $(call gb_ExternalProject_register_targets,xpdf,\
build \
commit 10fc13c94890837ca6a8c1a47efe3b2dcba85471
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 6 23:35:13 2013 +0200
lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 652e948..5d30da1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2427,9 +2427,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
))
define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_unpacked,$(1),orcus)
+$(call gb_LinkTarget_use_unpacked,$(1),liborcus)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,orcus/include) \
+ -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),orcus)
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index 4f08279..9fd6d9a 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\
src/lib/libcdr.h \
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 1a89d58..f71408e 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libcdr,cdr))
+$(eval $(call gb_ExternalProject_ExternalProject,libcdr,libcdr))
$(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
index e92d5ad..9074a9e 100644
--- a/libcdr/Module_libcdr.mk
+++ b/libcdr/Module_libcdr.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_CDR),NO)
$(eval $(call gb_Module_add_targets,libcdr,\
ExternalPackage_libcdr \
ExternalProject_libcdr \
- UnpackedTarball_cdr \
+ UnpackedTarball_libcdr \
))
endif
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_libcdr.mk
similarity index 61%
rename from libcdr/UnpackedTarball_cdr.mk
rename to libcdr/UnpackedTarball_libcdr.mk
index a4a427d..e5cd135 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_libcdr.mk
@@ -7,13 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
-$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,1))
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
libcdr/libcdr-0.0.13.patch \
))
diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk
index 3807c2b..b252a30 100644
--- a/libmspub/ExternalPackage_libmspub.mk
+++ b/libmspub/ExternalPackage_libmspub.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,mspub))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,libmspub))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmspub,\
src/lib/libmspub.h \
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
index a283a16..3e28ba2 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libmspub,mspub))
+$(eval $(call gb_ExternalProject_ExternalProject,libmspub,libmspub))
$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
index 844ac54..12cdfd31 100644
--- a/libmspub/Module_libmspub.mk
+++ b/libmspub/Module_libmspub.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_MSPUB),NO)
$(eval $(call gb_Module_add_targets,libmspub,\
ExternalPackage_libmspub \
ExternalProject_libmspub \
- UnpackedTarball_mspub \
+ UnpackedTarball_libmspub \
))
endif
diff --git a/libwps/UnpackedTarball_wps.mk b/libmspub/UnpackedTarball_libmspub.mk
similarity index 72%
copy from libwps/UnpackedTarball_wps.mk
copy to libmspub/UnpackedTarball_libmspub.mk
index c5698f7..044ce96 100644
--- a/libwps/UnpackedTarball_wps.mk
+++ b/libmspub/UnpackedTarball_libmspub.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,wps))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libmspub))
-$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL)))
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk
index b678129..2bfd9c9 100644
--- a/libmwaw/ExternalPackage_libmwaw.mk
+++ b/libmwaw/ExternalPackage_libmwaw.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,mwaw))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,libmwaw))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw,\
src/lib/libmwaw.hxx \
diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk
index b3881a9..52e23ce 100644
--- a/libmwaw/ExternalProject_libmwaw.mk
+++ b/libmwaw/ExternalProject_libmwaw.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,mwaw))
+$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,libmwaw))
$(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
diff --git a/libmwaw/Module_libmwaw.mk b/libmwaw/Module_libmwaw.mk
index c1a878b..5c6766d 100644
--- a/libmwaw/Module_libmwaw.mk
+++ b/libmwaw/Module_libmwaw.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_MWAW),NO)
$(eval $(call gb_Module_add_targets,libmwaw,\
ExternalPackage_libmwaw \
ExternalProject_libmwaw \
- UnpackedTarball_mwaw \
+ UnpackedTarball_libmwaw \
))
endif
diff --git a/libmwaw/UnpackedTarball_mwaw.mk b/libmwaw/UnpackedTarball_libmwaw.mk
similarity index 64%
rename from libmwaw/UnpackedTarball_mwaw.mk
rename to libmwaw/UnpackedTarball_libmwaw.mk
index 87d778b..08a1d61 100644
--- a/libmwaw/UnpackedTarball_mwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -7,13 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,mwaw))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
-$(eval $(call gb_UnpackedTarball_set_tarball,mwaw,$(MWAW_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mwaw,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
-$(eval $(call gb_UnpackedTarball_add_patches,mwaw,\
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
libmwaw/libmwaw-0.1.7-autotools.patch \
libmwaw/libmwaw-0.1.7-misc.patch \
))
diff --git a/libodfgen/ExternalPackage_libodfgen.mk b/libodfgen/ExternalPackage_libodfgen.mk
index 45920fe..6bbe90f 100644
--- a/libodfgen/ExternalPackage_libodfgen.mk
+++ b/libodfgen/ExternalPackage_libodfgen.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,odfgen))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libodfgen,inc/external/libodfgen,\
src/libodfgen.hxx \
diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk
index 2b417ff..9d34e06 100644
--- a/libodfgen/ExternalProject_libodfgen.mk
+++ b/libodfgen/ExternalProject_libodfgen.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,odfgen))
+$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,libodfgen))
$(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build))
diff --git a/libodfgen/Module_libodfgen.mk b/libodfgen/Module_libodfgen.mk
index c88c4bf..d20392f 100644
--- a/libodfgen/Module_libodfgen.mk
+++ b/libodfgen/Module_libodfgen.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_ODFGEN),NO)
$(eval $(call gb_Module_add_targets,libodfgen,\
ExternalPackage_libodfgen \
ExternalProject_libodfgen \
- UnpackedTarball_odfgen \
+ UnpackedTarball_libodfgen \
))
endif
diff --git a/libodfgen/UnpackedTarball_odfgen.mk b/libodfgen/UnpackedTarball_libodfgen.mk
similarity index 61%
rename from libodfgen/UnpackedTarball_odfgen.mk
rename to libodfgen/UnpackedTarball_libodfgen.mk
index 8d595b9..3a191d2 100644
--- a/libodfgen/UnpackedTarball_odfgen.mk
+++ b/libodfgen/UnpackedTarball_libodfgen.mk
@@ -7,13 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,odfgen))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen))
-$(eval $(call gb_UnpackedTarball_set_tarball,odfgen,$(ODFGEN_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,odfgen,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
-$(eval $(call gb_UnpackedTarball_add_patches,odfgen,\
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\
libodfgen/libodfgen-0.0.0-android.patch \
))
diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk
index 8ed7a67..8381e76 100644
--- a/liborcus/ExternalPackage_liborcus.mk
+++ b/liborcus/ExternalPackage_liborcus.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 80eb926..df8b494 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus,orcus))
+$(eval $(call gb_ExternalProject_ExternalProject,liborcus,liborcus))
$(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk
index af18ad3..78e90d9 100644
--- a/liborcus/Module_liborcus.mk
+++ b/liborcus/Module_liborcus.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_LIBORCUS),NO)
$(eval $(call gb_Module_add_targets,liborcus,\
ExternalProject_liborcus \
ExternalPackage_liborcus \
- UnpackedTarball_orcus \
+ UnpackedTarball_liborcus \
))
endif
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_liborcus.mk
similarity index 57%
rename from liborcus/UnpackedTarball_orcus.mk
rename to liborcus/UnpackedTarball_liborcus.mk
index 6370b2f..e43144d 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_liborcus.mk
@@ -7,31 +7,31 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,orcus))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,liborcus))
-$(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
-orcus_patches :=
+liborcus_patches :=
# make config.sub recognize arm-linux-androideabi
-orcus_patches += liborcus_0.1.0-configure.patch
+liborcus_patches += liborcus_0.1.0-configure.patch
# don't use dllimport
-orcus_patches += liborcus_0.1.0-dllimport.patch
+liborcus_patches += liborcus_0.1.0-dllimport.patch
ifeq ($(OS),MACOSX)
# no "tac" command on OS X, but "tail -r"
-orcus_patches += liborcus_0.1.0-tac.patch
+liborcus_patches += liborcus_0.1.0-tac.patch
endif
# <https://gitorious.org/orcus/orcus/merge_requests/2#
# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
# f60d6eecee72349993a392a9a63ddf3383d3b8c8 at 2>:
-$(eval $(call gb_UnpackedTarball_add_patches,orcus,\
- $(foreach patch,$(orcus_patches),liborcus/$(patch)) \
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+ $(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
))
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk
index 5838a13..042f10b 100644
--- a/libvisio/ExternalPackage_libvisio.mk
+++ b/libvisio/ExternalPackage_libvisio.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,visio))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,libvisio))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\
src/lib/libvisio.h \
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 961db68..9ef2a84f 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libvisio,visio))
+$(eval $(call gb_ExternalProject_ExternalProject,libvisio,libvisio))
$(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk
index 3714265..56ef74c 100644
--- a/libvisio/Module_libvisio.mk
+++ b/libvisio/Module_libvisio.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_VISIO),NO)
$(eval $(call gb_Module_add_targets,libvisio,\
ExternalPackage_libvisio \
ExternalProject_libvisio \
- UnpackedTarball_visio \
+ UnpackedTarball_libvisio \
))
endif
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_libvisio.mk
similarity index 72%
rename from libvisio/UnpackedTarball_visio.mk
rename to libvisio/UnpackedTarball_libvisio.mk
index 59c29ac..f71161a 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
-$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
# vim: set noet sw=4 ts=4:
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index ae1b029..0b45fb4 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,libwpd))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
src/lib/libwpd.h \
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index 0f46cfd..9759fc4 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd,wpd))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd,libwpd))
$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
index 13ef595..401644a 100644
--- a/libwpd/Module_libwpd.mk
+++ b/libwpd/Module_libwpd.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPD),NO)
$(eval $(call gb_Module_add_targets,libwpd,\
ExternalProject_libwpd \
ExternalPackage_libwpd \
- UnpackedTarball_wpd \
+ UnpackedTarball_libwpd \
))
endif
diff --git a/libwps/UnpackedTarball_wps.mk b/libwpd/UnpackedTarball_libwpd.mk
similarity index 73%
rename from libwps/UnpackedTarball_wps.mk
rename to libwpd/UnpackedTarball_libwpd.mk
index c5698f7..d4b4c7a 100644
--- a/libwps/UnpackedTarball_wps.mk
+++ b/libwpd/UnpackedTarball_libwpd.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,wps))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpd))
-$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL)))
# vim: set noet sw=4 ts=4:
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
deleted file mode 100644
index 24e589c..0000000
--- a/libwpd/UnpackedTarball_wpd.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,wpd))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
-
-# $(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0))
-
-# wpd_patches :=
-
-# $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
-# $(foreach patch,$(wpd_patches),libwpd/$(patch)) \
-# ))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk
index 916aae1..927f2da 100644
--- a/libwpg/ExternalPackage_libwpg.mk
+++ b/libwpg/ExternalPackage_libwpg.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,wpg))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg,inc/external/libwpg,\
src/lib/libwpg.h \
diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk
index 3f6522c..0a0b6bc 100644
--- a/libwpg/ExternalProject_libwpg.mk
+++ b/libwpg/ExternalProject_libwpg.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libwpg,wpg))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpg,libwpg))
$(eval $(call gb_ExternalProject_use_autoconf,libwpg,build))
diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
index d15e01d..17abb68 100644
--- a/libwpg/Module_libwpg.mk
+++ b/libwpg/Module_libwpg.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPG),NO)
$(eval $(call gb_Module_add_targets,libwpg,\
ExternalProject_libwpg \
ExternalPackage_libwpg \
- UnpackedTarball_wpg \
+ UnpackedTarball_libwpg \
))
endif
diff --git a/libmspub/UnpackedTarball_mspub.mk b/libwpg/UnpackedTarball_libwpg.mk
similarity index 73%
rename from libmspub/UnpackedTarball_mspub.mk
rename to libwpg/UnpackedTarball_libwpg.mk
index 5193169..03be206 100644
--- a/libmspub/UnpackedTarball_mspub.mk
+++ b/libwpg/UnpackedTarball_libwpg.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,mspub))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg))
-$(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL)))
# vim: set noet sw=4 ts=4:
diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk
index 2390a8f..995ec7c 100644
--- a/libwps/ExternalPackage_libwps.mk
+++ b/libwps/ExternalPackage_libwps.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,wps))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\
src/lib/libwps.h \
diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk
index 322d50a..0cccf2c 100644
--- a/libwps/ExternalProject_libwps.mk
+++ b/libwps/ExternalProject_libwps.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,libwps,wps))
+$(eval $(call gb_ExternalProject_ExternalProject,libwps,libwps))
$(eval $(call gb_ExternalProject_use_autoconf,libwps,build))
diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk
index 36ab218..c5fd166 100644
--- a/libwps/Module_libwps.mk
+++ b/libwps/Module_libwps.mk
@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPS),NO)
$(eval $(call gb_Module_add_targets,libwps,\
ExternalProject_libwps \
ExternalPackage_libwps \
- UnpackedTarball_wps \
+ UnpackedTarball_libwps \
))
endif
diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwps/UnpackedTarball_libwps.mk
similarity index 73%
rename from libwpg/UnpackedTarball_wpg.mk
rename to libwps/UnpackedTarball_libwps.mk
index 00c127c..1fd633a 100644
--- a/libwpg/UnpackedTarball_wpg.mk
+++ b/libwps/UnpackedTarball_libwps.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,wpg))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps))
-$(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
# vim: set noet sw=4 ts=4:
commit 276021c76102e685c7dbe3776d5f79f71a59ac82
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 6 22:54:30 2013 +0200
gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.
Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
index 6a92937..753041c 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 aaf1520..314cdf2 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 283375e..5b5b1032 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 22ae742..11bf6bc 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 ce66dea..2985ddd 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 42a5c7f..875a4bf 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 c8cad9b..2bae746 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 bb63996..8a94249 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 c56d9ee..c5aa3fa 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 bfb46ba..826a599 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 6b5361c..47ea6ac 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 a09e923..783fb49 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 aa9c56c..ad8dc2e 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 b82ec97..9185c44 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 8cead35..1fff881 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 569fb7c..d1b297f 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 3126729..b3a5272 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 2df3011..3a20cd7 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 23fd99b..641497b 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 7175f5d..6332ec2 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 6b5cf6f..f03ffc761 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 72e6fb1..3c7474f 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 b7f6d95..5938cf4 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 4c5d79d..3c612e5 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 dc3d8d8..ffcf2d9 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 215bd1c..e1c8b19 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 93cdfd5..bc865bf 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 93967f5..068f08d 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 7500268..2f0b8d1 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 3040689..07ca3fa 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 dc77783..825a2b3 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 c6b8347..1a89d58 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 d9e5a2f..833cf1a 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 9e344b9..12e1a8d 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 5534c76..a283a16 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 452dd92..b3881a9 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 e7b5fa3..2b417ff 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 93cdcc4..80eb926 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 6364a9e..961db68 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 0f20be7..0f46cfd 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 e9dc638..3f6522c 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 ca0728d..322d50a 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 5ea4682..cf7427e 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 cefa967..5dcc5ab 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 46af1bd..0c2009d 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 0cf95dd..50ca271 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 99ccd61..8f2365c 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 be16385..a0981bd 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 396841f..943e91a 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 2666965..206e6bb 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 63aa943..d455d72f 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 c61e506..d734687 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 9093d2d..2bf01db 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 34761cc..c136c13 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 1512d2a..4d6dcda 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 16a678d..8f74c20 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 811a5d3..e964610 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 04e3273..ffe58e7 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 bf147a9..a8b5403 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 \
commit 96907bfb02c00d3d3d4085fc4b10d8e0eb0b9f11
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue May 7 00:50:15 2013 +0200
np_sdk: remove both Package_inc and Package_npapi
This is a bit of a mess, apparently there are some headers here that may
come from the system and others that are always internal?
Change-Id: Ifbf486d3016bc87849e2593d83b3d48dae3aeca0
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c2f21a0..652e948 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -89,9 +89,12 @@ endif
ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
+# yes this uses internal headers too...
+# they are split across 2 dirs for this reason
define gb_LinkTarget__use_npapi_headers
$(call gb_LinkTarget_set_include,$(1),\
$(NPAPI_HEADERS_CFLAGS) \
+ -I$(SRCDIR)/np_sdk \
$$(INCLUDE) \
)
@@ -100,9 +103,9 @@ endef
else #!SYSTEM_NPAPI_HEADERS
define gb_LinkTarget__use_npapi_headers
-$(call gb_LinkTarget_use_package,$(1),npapi)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(OUTDIR)/inc/external/npsdk \
+ -I$(SRCDIR)/np_sdk/inc \
+ -I$(SRCDIR)/np_sdk \
$$(INCLUDE) \
)
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index b74d6ba..90d4880 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -11,10 +11,6 @@
$(eval $(call gb_Library_Library,npsoplugin))
-$(eval $(call gb_Library_use_packages,npsoplugin,\
- np_sdk_inc \
-))
-
$(eval $(call gb_Library_use_externals,npsoplugin,\
boost_headers \
npapi_headers \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index bae1bbf..3970fdf 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_Library_Library,pl))
$(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
-$(eval $(call gb_Library_use_package,pl,np_sdk_inc))
-
$(eval $(call gb_Library_use_externals,pl,\
boost_headers \
npapi_headers \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index deb62a8..13d2c05 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -14,10 +14,6 @@ endif
$(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
-$(eval $(call gb_StaticLibrary_use_packages,plugcon,\
- np_sdk_inc \
-))
-
$(eval $(call gb_StaticLibrary_use_externals,plugcon,\
boost_headers \
npapi_headers \
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index b698e03..5d82712 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -12,16 +12,6 @@ $(eval $(call gb_Module_Module,np_sdk))
ifneq (,$(filter YES,$(ENABLE_NPAPI_FROM_BROWSER) $(ENABLE_NPAPI_INTO_BROWSER)))
-$(eval $(call gb_Module_add_targets,np_sdk,\
- Package_inc \
-))
-
-ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
-$(eval $(call gb_Module_add_targets,np_sdk,\
- Package_npapi \
-))
-endif
-
ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
$(eval $(call gb_Module_add_targets,np_sdk,\
StaticLibrary_nputils \
diff --git a/np_sdk/Package_inc.mk b/np_sdk/Package_inc.mk
deleted file mode 100644
index 9f4d857..0000000
--- a/np_sdk/Package_inc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,np_sdk_inc,$(SRCDIR)/np_sdk))
-
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri.h,mozsrc/jri.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri_md.h,mozsrc/jri_md.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jritypes.h,mozsrc/jritypes.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npupp.h,mozsrc/npupp.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/plugin.h,mozsrc/plugin.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/np_sdk/Package_npapi.mk b/np_sdk/Package_npapi.mk
deleted file mode 100644
index 6737a49..0000000
--- a/np_sdk/Package_npapi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,npapi,$(SRCDIR)/np_sdk))
-
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npapi.h,inc/npapi.h))
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npfunctions.h,inc/npfunctions.h))
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npruntime.h,inc/npruntime.h))
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/nptypes.h,inc/nptypes.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index b85eaa0..3ff3314 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -22,11 +22,11 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\
- np_sdk/mozsrc/npwin \
+ np_sdk/npsdk/npwin \
))
else
$(eval $(call gb_StaticLibrary_add_cobjects,nputils,\
- np_sdk/mozsrc/npunix \
+ np_sdk/npsdk/npunix \
))
endif
diff --git a/np_sdk/mozsrc/LEGAL b/np_sdk/npsdk/LEGAL
similarity index 100%
rename from np_sdk/mozsrc/LEGAL
rename to np_sdk/npsdk/LEGAL
diff --git a/np_sdk/mozsrc/LICENSE b/np_sdk/npsdk/LICENSE
similarity index 100%
rename from np_sdk/mozsrc/LICENSE
rename to np_sdk/npsdk/LICENSE
diff --git a/np_sdk/mozsrc/README b/np_sdk/npsdk/README
similarity index 100%
rename from np_sdk/mozsrc/README
rename to np_sdk/npsdk/README
diff --git a/np_sdk/mozsrc/jri.h b/np_sdk/npsdk/jri.h
similarity index 100%
rename from np_sdk/mozsrc/jri.h
rename to np_sdk/npsdk/jri.h
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/npsdk/jri_md.h
similarity index 100%
rename from np_sdk/mozsrc/jri_md.h
rename to np_sdk/npsdk/jri_md.h
diff --git a/np_sdk/mozsrc/jritypes.h b/np_sdk/npsdk/jritypes.h
similarity index 100%
rename from np_sdk/mozsrc/jritypes.h
rename to np_sdk/npsdk/jritypes.h
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/npsdk/npunix.c
similarity index 100%
rename from np_sdk/mozsrc/npunix.c
rename to np_sdk/npsdk/npunix.c
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/npsdk/npupp.h
similarity index 100%
rename from np_sdk/mozsrc/npupp.h
rename to np_sdk/npsdk/npupp.h
diff --git a/np_sdk/mozsrc/npwin.cxx b/np_sdk/npsdk/npwin.cxx
similarity index 100%
rename from np_sdk/mozsrc/npwin.cxx
rename to np_sdk/npsdk/npwin.cxx
diff --git a/np_sdk/mozsrc/plugin.h b/np_sdk/npsdk/plugin.h
similarity index 94%
rename from np_sdk/mozsrc/plugin.h
rename to np_sdk/npsdk/plugin.h
index 67e049e..ec0dc04 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list