diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2017-03-14 08:48:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 08:48:58 (GMT) |
| commit | 28e1101e651a939f50ef5992c0d1aa79e93e9aa0 (patch) | |
| tree | f6050224bd45e3b3c0ab947ae72ecb041e504e0c /Makefile | |
| parent | a3ac9460ce1be67dace11784e174ba2d69703d7d (diff) | |
| parent | 24d37efa5dae04fbe143c33b8c6710a8606c5451 (diff) | |
| download | mxe-28e1101e651a939f50ef5992c0d1aa79e93e9aa0.zip mxe-28e1101e651a939f50ef5992c0d1aa79e93e9aa0.tar.gz mxe-28e1101e651a939f50ef5992c0d1aa79e93e9aa0.tar.bz2 | |
Merge pull request #1660 from tonytheodore/cmake-conf
cmake: update and improve configuration with templates
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -60,7 +60,7 @@ STRIP_EXE := $(true) # All pkgs have (implied) order-only dependencies on MXE_CONF_PKGS. # These aren't meaningful to the pkg list in http://mxe.cc/#packages so # use a list in case we want to separate autotools, cmake etc. -MXE_CONF_PKGS := mxe-conf +MXE_CONF_PKGS := cmake-conf mxe-conf # define some whitespace variables define newline @@ -524,6 +524,7 @@ $(1): $(PREFIX)/$(3)/installed/$(1) $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ $(PKG_PATCHES) \ $(PKG_TESTFILES) \ + $($(1)_FILE_DEPS) \ $(addprefix $(PREFIX)/$(3)/installed/,$(value $(call LOOKUP_PKG_RULE,$(1),DEPS,$(3)))) \ $(and $($(3)_DEPS),$(addprefix $(PREFIX)/$($(3)_DEPS)/installed/,$(filter-out $(MXE_CONF_PKGS),$($($(3)_DEPS)_PKGS)))) \ | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \ |