From 44af1866aa41cfbbad48583106cb82201ded4fcb Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 27 Sep 2006 14:06:46 +0000
Subject: move tools from toolchain/ to tools/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4866 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/Makefile | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 tools/Makefile

(limited to 'tools/Makefile')

diff --git a/tools/Makefile b/tools/Makefile
new file mode 100644
index 000000000..21d6a94f9
--- /dev/null
+++ b/tools/Makefile
@@ -0,0 +1,61 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# Main makefile for the host tools
+#
+include $(TOPDIR)/rules.mk
+TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage
+
+TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
+
+all: install
+download: $(TARGETS_DOWNLOAD)
+install: $(TARGETS_INSTALL)
+clean: $(TARGETS_CLEAN)
+
+squashfs-compile: lzma-install
+
+TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles
+
+$(TOOL_STAMP_DIR):
+	mkdir -p $@
+
+$(STAGING_DIR):
+	@mkdir -p $@/lib
+	@mkdir -p $@/include
+	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
+	@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
+
+$(TOOL_BUILD_DIR):
+	@mkdir -p $@
+
+%-download: FORCE
+	$(MAKE) -C $(patsubst %-download,%,$@) download
+
+%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
+	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
+		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+	}
+	@touch $(TOOL_STAMP_DIR)/.tool_$@
+
+%-compile: %-prepare 
+	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
+		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+	}
+	@touch $(TOOL_STAMP_DIR)/.tool_$@
+
+%-install: %-compile
+	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
+		$(MAKE) -C $(patsubst %-install,%,$@) install; \
+	}
+	@touch $(TOOL_STAMP_DIR)/.tool_$@
+
+%-clean: FORCE
+	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
+	@rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-*
+
-- 
cgit v1.2.3


From 652d9073459fce55104f0db8f64fc5b9100c979d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 27 Sep 2006 17:03:36 +0000
Subject: add portability fixes for toolchain/tools (full tools/toolchain build
 works on osx now)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4867 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tools/Makefile')

diff --git a/tools/Makefile b/tools/Makefile
index 21d6a94f9..741fd48f6 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -28,8 +28,10 @@ $(TOOL_STAMP_DIR):
 $(STAGING_DIR):
 	@mkdir -p $@/lib
 	@mkdir -p $@/include
-	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
+	@mkdir -p $@/include-host
+	$(CP) ./include/*.h $@/include-host/
 	@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
+	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
 
 $(TOOL_BUILD_DIR):
 	@mkdir -p $@
-- 
cgit v1.2.3


From c1df5b45043803c52f96c5377fbc858804004590 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Oct 2006 16:36:47 +0000
Subject: fix gene2fs build on freebsd

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5019 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/Makefile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'tools/Makefile')

diff --git a/tools/Makefile b/tools/Makefile
index 741fd48f6..c8fad2323 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage
 
 TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
+TARGETS_PREPARE:=$(patsubst %,%-prepare,$(TARGETS-y))
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
 
@@ -25,13 +26,9 @@ TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles
 $(TOOL_STAMP_DIR):
 	mkdir -p $@
 
-$(STAGING_DIR):
-	@mkdir -p $@/lib
-	@mkdir -p $@/include
-	@mkdir -p $@/include-host
-	$(CP) ./include/*.h $@/include-host/
-	@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
-	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
+$(STAGING_DIR)/include-host:
+	@mkdir -p $@
+	@$(CP) ./include/*.h $@/
 
 $(TOOL_BUILD_DIR):
 	@mkdir -p $@
@@ -39,7 +36,7 @@ $(TOOL_BUILD_DIR):
 %-download: FORCE
 	$(MAKE) -C $(patsubst %-download,%,$@) download
 
-%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
+%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR)/include-host $(TOOL_BUILD_DIR) FORCE
 	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
 	}
-- 
cgit v1.2.3