diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-14 11:17:30 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-17 06:26:29 +0000 |
| commit | 85d1e39d742d7798369b0071f9a5de5f62810d39 (patch) | |
| tree | 2cefa2cedd017918c31c3a132c5026e0e69e1428 /solenv | |
| parent | 42aec34a5d83d863e050da85f88b31417c44b698 (diff) | |
gbuild: Fix and check package dependencies.
Change-Id: Ia54def7a404e07974eb1e8a556f4659cd974e7f8
Reviewed-on: https://gerrit.libreoffice.org/7081
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Package.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/WinResTarget.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/mingw.mk | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 5b9586bd4dbc..5cbe70cd0f79 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 1d3e8c25cfe9..c110491722c3 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 dbe14086d4b4..3341e358b790 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 ac5218c2429c..58f834a2f20c 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 \ )) |