summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2014-02-08 16:34:47 (GMT)
committerTony Theodore <tonyt@logyst.com>2014-02-08 16:34:47 (GMT)
commit5a18b2786be138604e82a54f84e131536371781b (patch)
tree22fd3bd693189735604bd683447f9192428061ed /src
parentb5449a4a2616140c30b1b66816bc839b16e82b4b (diff)
parentc1ad1344399ec3ee81bac467cd89c6438a9b8ed6 (diff)
downloadmxe-5a18b2786be138604e82a54f84e131536371781b.zip
mxe-5a18b2786be138604e82a54f84e131536371781b.tar.gz
mxe-5a18b2786be138604e82a54f84e131536371781b.tar.bz2
Merge pull request #320 from tonytheodore/lookup-pkg-rule
Makefile: refactor lookup of pkg build rules and deps
Diffstat (limited to 'src')
-rw-r--r--src/gcc.mk6
-rw-r--r--src/sdl_rwhttp.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gcc.mk b/src/gcc.mk
index 3b6a23a..209bf51 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -11,9 +11,9 @@ $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_
$(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := binutils gcc-cloog gcc-gmp gcc-isl gcc-mpc gcc-mpfr
-$(PKG)_DEPS_i686-pc-mingw32 := mingwrt w32api
-$(PKG)_DEPS_i686-w64-mingw32 := mingw-w64
-$(PKG)_DEPS_x86_64-w64-mingw32 := mingw-w64
+$(PKG)_DEPS_i686-pc-mingw32 := $($(PKG)_DEPS) mingwrt w32api
+$(PKG)_DEPS_i686-w64-mingw32 := $($(PKG)_DEPS) mingw-w64
+$(PKG)_DEPS_x86_64-w64-mingw32 := $($(PKG)_DEPS) mingw-w64
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
diff --git a/src/sdl_rwhttp.mk b/src/sdl_rwhttp.mk
index 65abffb..3f98a46 100644
--- a/src/sdl_rwhttp.mk
+++ b/src/sdl_rwhttp.mk
@@ -10,9 +10,9 @@ $(PKG)_FILE := SDL_rwhttp-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/mgerhardy/SDL_rwhttp/releases/download/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
$(PKG)_DEPS := gcc curl
-$(PKG)_DEPS_i686-pc-mingw32 := sdl sdl_net
-$(PKG)_DEPS_i686-w64-mingw32 := sdl2 sdl2_net
-$(PKG)_DEPS_x86_64-w64-mingw32 := sdl2 sdl2_net
+$(PKG)_DEPS_i686-pc-mingw32 := $($(PKG)_DEPS) sdl sdl_net
+$(PKG)_DEPS_i686-w64-mingw32 := $($(PKG)_DEPS) sdl2 sdl2_net
+$(PKG)_DEPS_x86_64-w64-mingw32 := $($(PKG)_DEPS) sdl2 sdl2_net
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://github.com/mgerhardy/SDL_rwhttp/tags' | \