# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1375754873 14400
# Node ID ff92c0dc6aeb552c79b7caa466637c9723e5032a
# Parent  eea36aa5fc59e3bbf71342aa942196d02da792b1
handle build-PKG dependencies in src/build-PKG.mk files

diff -r eea36aa5fc59 -r ff92c0dc6aeb Makefile.in
--- a/Makefile.in	Mon Aug 05 21:53:07 2013 -0400
+++ b/Makefile.in	Mon Aug 05 22:07:53 2013 -0400
@@ -612,8 +612,3 @@
 	mkdir $(distdir)
 	$(TAR) cf - $(DIST_FILES) | ( cd $(distdir) ; $(TAR) xpf - )
 	$(TAR) czf $(distdir).tar.gz $(distdir)
-
-build-autoconf build-bison: build-xz
-build-automake: build-autoconf
-build-binutils: build-gcc
-build-gcc: build-cmake
diff -r eea36aa5fc59 -r ff92c0dc6aeb src/build-autoconf.mk
--- a/src/build-autoconf.mk	Mon Aug 05 21:53:07 2013 -0400
+++ b/src/build-autoconf.mk	Mon Aug 05 22:07:53 2013 -0400
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := autoconf-$($(PKG)_VERSION)
 $(PKG)_FILE     := autoconf-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := build-xz
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
diff -r eea36aa5fc59 -r ff92c0dc6aeb src/build-automake.mk
--- a/src/build-automake.mk	Mon Aug 05 21:53:07 2013 -0400
+++ b/src/build-automake.mk	Mon Aug 05 22:07:53 2013 -0400
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := automake-$($(PKG)_VERSION)
 $(PKG)_FILE     := automake-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := build-autoconf
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
diff -r eea36aa5fc59 -r ff92c0dc6aeb src/build-binutils.mk
--- a/src/build-binutils.mk	Mon Aug 05 21:53:07 2013 -0400
+++ b/src/build-binutils.mk	Mon Aug 05 22:07:53 2013 -0400
@@ -8,7 +8,11 @@
 $(PKG)_FILE     := binutils-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+ifeq ($(MXE_SYSTEM),mingw)
+  $(PKG)_DEPS     :=
+else
+  $(PKG)_DEPS     := build-gcc
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \
diff -r eea36aa5fc59 -r ff92c0dc6aeb src/build-bison.mk
--- a/src/build-bison.mk	Mon Aug 05 21:53:07 2013 -0400
+++ b/src/build-bison.mk	Mon Aug 05 22:07:53 2013 -0400
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := bison-$($(PKG)_VERSION)
 $(PKG)_FILE     := bison-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     := build-xz
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
diff -r eea36aa5fc59 -r ff92c0dc6aeb src/build-gcc.mk
--- a/src/build-gcc.mk	Mon Aug 05 21:53:07 2013 -0400
+++ b/src/build-gcc.mk	Mon Aug 05 22:07:53 2013 -0400
@@ -8,7 +8,9 @@
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
-ifneq ($(MXE_NATIVE_BUILD),yes)
+ifeq ($(MXE_NATIVE_BUILD),yes)
+  $(PKG)_DEPS := build-cmake
+else
   ifeq ($(MXE_SYSTEM),mingw)
     $(PKG)_DEPS := mingwrt w32api build-binutils
   endif