diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-14 07:51:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 07:51:31 (GMT) |
| commit | 837e5e705c60bb298bcc5884c77330e318923178 (patch) | |
| tree | 5f16d2a170992f9fef83a0bf7dca2050f73bc8d1 /Makefile | |
| parent | de9611cfeec38f2c9efd1836a2c574b241ecf44e (diff) | |
| parent | 38a5c97d0b6cee5fb4c658ef4ec1843ec9bb2d0a (diff) | |
| download | mxe-837e5e705c60bb298bcc5884c77330e318923178.zip mxe-837e5e705c60bb298bcc5884c77330e318923178.tar.gz mxe-837e5e705c60bb298bcc5884c77330e318923178.tar.bz2 | |
Merge pull request #1432 from LuaAndC/skeleton
add tool skeleton.py
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -369,16 +369,18 @@ $(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): | $(PREFIX)/installed/.gitkee @rm -f '$(PREFIX)/installed/print-git-oneline-'* @touch '$@' -# include core MXE packages and set *_MAKEFILE +# include core MXE packages and set base filenames include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) $(foreach PKG,$(PKGS),\ - $(eval $(PKG)_MAKEFILE := $(realpath $(TOP_DIR)/src/$(PKG).mk))) + $(eval $(PKG)_MAKEFILE := $(realpath $(TOP_DIR)/src/$(PKG).mk)) \ + $(eval $(PKG)_TEST_FILE := $(realpath $(wildcard $(TOP_DIR)/src/$(PKG)-test.*)))) -# include files from MXE_PLUGIN_DIRS, set *_MAKEFILE and `all-<plugin>` target +# include files from MXE_PLUGIN_DIRS, set base filenames and `all-<plugin>` target PLUGIN_FILES := $(realpath $(wildcard $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS)))) PLUGIN_PKGS := $(basename $(notdir $(PLUGIN_FILES))) $(foreach FILE,$(PLUGIN_FILES),\ - $(eval $(basename $(notdir $(FILE)))_MAKEFILE ?= $(FILE)) \ + $(eval $(basename $(notdir $(FILE)))_MAKEFILE ?= $(FILE)) \ + $(eval $(basename $(notdir $(FILE)))_TEST_FILE ?= $(wildcard $(basename $(FILE))-test.*)) \ $(eval all-$(lastword $(call split,/,$(dir $(FILE)))): $(basename $(notdir $(FILE))))) include $(PLUGIN_FILES) PKGS := $(sort $(PKGS) $(PLUGIN_PKGS)) @@ -525,6 +527,9 @@ build-only-$(1)_$(3): TARGET = $(3) build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a) build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32) +build-only-$(1)_$(3): SOURCE_DIR = $(2)/$($(1)_SUBDIR) +build-only-$(1)_$(3): BUILD_DIR = $(2)/$($(1)_SUBDIR).build_ +build-only-$(1)_$(3): TEST_FILE = $($(1)_TEST_FILE) build-only-$(1)_$(3): CMAKE_RUNRESULT_FILE = $(PREFIX)/share/cmake/modules/TryRunResults.cmake build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake build-only-$(1)_$(3): CMAKE_TOOLCHAIN_DIR = $(PREFIX)/$(3)/share/cmake/mxe-conf.d @@ -543,6 +548,8 @@ build-only-$(1)_$(3): perl --version 2>&1 | head -3 rm -rf '$(2)' mkdir -p '$(2)' + mkdir -p '$$(SOURCE_DIR)' + mkdir -p '$$(BUILD_DIR)' # disable wine with readonly directory # see https://github.com/mxe/mxe/issues/841 |