RepositoryExternal.mk | 7 ++-----
cli_ure/Library_cli_cppuhelper_native.mk | 4 ----
i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 2 +-
odk/CustomTarget_check.mk | 6 +-----
solenv/gbuild/Package.mk | 2 ++
solenv/gbuild/WinResTarget.mk | 5 -----
solenv/gbuild/platform/com_MSC_class.mk | 5 -----
solenv/gbuild/platform/mingw.mk | 2 --
8 files changed, 6 insertions(+), 27 deletions(-)
New commits:
commit 85d1e39d742d7798369b0071f9a5de5f62810d39
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Sat Dec 14 11:17:30 2013 +0100
gbuild: Fix and check package dependencies.
Change-Id: Ia54def7a404e07974eb1e8a556f4659cd974e7f8
Reviewed-on: https://gerrit.libreoffice.org/7081
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: Matúš Kukan <matus.ku...@collabora.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b44927e..3d9a4bf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -399,9 +399,6 @@ $(call gb_LinkTarget_set_include,$(1),\
)
ifeq ($(COM),MSC)
-$(call gb_LinkTarget_use_package,$(1),\
- mythes \
-)
$(call gb_LinkTarget_use_static_libraries,$(1),\
mythes \
)
@@ -997,14 +994,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,
\
endif
define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
-
ifeq ($(COM),MSC)
$(call gb_LinkTarget_use_libraries,$(1),\
raptor2 \
rdf \
)
else
+$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
+
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
-L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \
diff --git a/cli_ure/Library_cli_cppuhelper_native.mk
b/cli_ure/Library_cli_cppuhelper_native.mk
index 39c13c8..fa55e42 100644
--- a/cli_ure/Library_cli_cppuhelper_native.mk
+++ b/cli_ure/Library_cli_cppuhelper_native.mk
@@ -34,10 +34,6 @@ $(eval $(call
gb_Library_use_internal_bootstrap_api,cli_cppuhelper,\
udkapi \
))
-$(eval $(call gb_Library_use_packages,cli_cppuhelper,\
- cli_ure_cliuno \
-))
-
$(eval $(call gb_Library_use_libraries,cli_cppuhelper,\
cppu \
cppuhelper \
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index 3907641..b50653c 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -34,7 +34,7 @@ $(eval $(call
gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DENABLE_LIBL
ifeq ($(SYSTEM_LIBLANGTAG),YES)
$(eval $(call
gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DSYSTEM_LIBLANGTAG))
else
-$(eval $(call
gb_CppunitTest_use_package,i18nlangtag_test_languagetag,langtag_data))
+$(eval $(call
gb_CppunitTest_use_package,i18nlangtag_test_languagetag,liblangtag_data))
endif
endif
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 88af63a..295f353 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -32,17 +32,13 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Executable_get_target,$(exe))) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli))
\
$(call gb_Package_get_target,odk_config) \
- $(if $(filter WNT,$(OS)),\
- $(call gb_Package_get_target,odk_config_win),\
- $(call gb_Package_get_target,odk_config_notwin) \
- ) \
+ $(if $(filter WNT,$(OS)),$(call
gb_Package_get_target,odk_config_win)) \
$(call gb_Package_get_target,odk_docs) \
$(call gb_Package_get_target,odk_html) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \
$(call gb_Package_get_target,odk_lib) \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
- $(call gb_Package_get_target,odk_uno_loader_classes) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 5b9586b..5cbe70c 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -79,6 +79,7 @@ $(call gb_Package_get_preparation_target,%) :
# Package_foo makefiles.
$(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
+ $(if $(PACAKGE_DEFINED),,$(call gb_Output_error,Something depends on
package $* which does not exist.))
rm -f $@ && \
mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
@@ -86,6 +87,7 @@ $(call gb_Package_get_target,%) :
define gb_Package_Package_internal
gb_Package_SOURCEDIR_$(1) := $(2)
gb_Package_OUTDIR_$(1) := $(INSTROOT)
+$(call gb_Package_get_target,$(1)) : PACAKGE_DEFINED := $(true)
$(call gb_Package_get_target,$(1)) : FILES :=
$(call gb_Package_get_clean_target,$(1)) : FILES := $(call
gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
$(call gb_Package_get_target,$(1)) : $(call
gb_Package_get_preparation_target,$(1))
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 1d3e8c25..c110491 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -19,9 +19,6 @@
# WinResTarget class
-# defined by platform:
-# gb_WinResTarget_WinResTarget_platform
-
gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
define gb_WinResTarget_WinResTarget
@@ -38,8 +35,6 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst
-isystem,-I,$(SOLAR
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
-$(call gb_WinResTarget_WinResTarget_platform,$(1))
-
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_WinResTarget_get_dep_target,$(1)) : DEFS :=
$$(gb_WinResTarget_DEFAULTDEFS)
$(call gb_WinResTarget_get_dep_target,$(1)) : FLAGS := $$(gb_RCFLAGS)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index dbe1408..3341e35 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -473,11 +473,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(RCFILE) )
endef
-define gb_WinResTarget_WinResTarget_platform
-$(call gb_WinResTarget_get_target,$(1)) : $(call
gb_Package_get_target,solenv_inc)
-
-endef
-
$(eval $(call gb_Helper_make_dep_targets,\
WinResTarget \
))
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index ac5218c..58f834a 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -307,8 +307,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(RCFILE) )
endef
-gb_WinResTarget_WinResTarget_platform :=
-
$(eval $(call gb_Helper_make_dep_targets,\
WinResTarget \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
