From 38c43b5017befbf0153d3a5f2165e80c064329ad Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 11 Mar 2018 13:19:24 +1100 Subject: [PATCH] sub makefiles: standardize names and add to build-pkg --- Makefile | 6 +++--- github.mk => mxe.github.mk | 0 patch.mk => mxe.patch.mk | 0 updates.mk => mxe.updates.mk | 0 tools/build-pkg.lua | 10 ++++++---- 5 files changed, 9 insertions(+), 7 deletions(-) rename github.mk => mxe.github.mk (100%) rename patch.mk => mxe.patch.mk (100%) rename updates.mk => mxe.updates.mk (100%) diff --git a/Makefile b/Makefile index 3438a360..4318c138 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,7 @@ define AUTOTOOLS_BUILD endef # include github related functions -include $(PWD)/github.mk +include $(PWD)/mxe.github.mk # shared lib preload to disable networking, enable faketime etc PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES @@ -1081,5 +1081,5 @@ docs/packages.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '}' >> $@ # for other mxe functions -include patch.mk -include updates.mk +include mxe.patch.mk +include mxe.updates.mk diff --git a/github.mk b/mxe.github.mk similarity index 100% rename from github.mk rename to mxe.github.mk diff --git a/patch.mk b/mxe.patch.mk similarity index 100% rename from patch.mk rename to mxe.patch.mk diff --git a/updates.mk b/mxe.updates.mk similarity index 100% rename from updates.mk rename to mxe.updates.mk diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index d1c3c7f9..90949c6a 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -1057,14 +1057,16 @@ local function makeMxeSourcePackage() -- dependencies local deps = {} local files = { + 'docs', + 'ext', 'LICENSE.md', 'Makefile', - 'patch.mk', + 'mxe.github.mk', + 'mxe.patch.mk', + 'mxe.updates.mk', + 'plugins', 'README.md', - 'docs', - 'ext', 'src', - 'plugins', 'tools', } local d1 = "MXE source"