summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rw-r--r--mk/build.mk22
-rw-r--r--target/arm/Makefile5
-rw-r--r--target/cris/Makefile5
-rw-r--r--target/mipsel/Makefile5
-rw-r--r--tools/adk/Makefile9
-rw-r--r--tools/cpio/Makefile2
-rw-r--r--tools/mkcrypt/Makefile2
8 files changed, 11 insertions, 40 deletions
diff --git a/TODO b/TODO
index 23caeef0d..34fed5d18 100644
--- a/TODO
+++ b/TODO
@@ -13,7 +13,6 @@
- check all patches for CFLAGS compliance, fhonour patch from FreeWRT
- busybox update and SuSv3 removal
- check rtc support on foxg20
-- relocatable gcc (adk)
- adkinstall with NTP and hwclock support
- PKG_CONFLICTS for python/python2, is this possible with Kconfig?
- mirror only option, for no internet access
diff --git a/mk/build.mk b/mk/build.mk
index 662ebc221..3384cc602 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -113,7 +113,8 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
.NOTPARALLEL:
.PHONY: all world clean cleantarget cleandir distclean image_clean
-world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)
+world:
+ mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps $(TOOLS_DIR) $(TOOLS_BUILD_DIR)
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
${BASH} ${TOPDIR}/scripts/update-sys
${BASH} ${TOPDIR}/scripts/update-pkg
@@ -133,18 +134,6 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages
endif
-$(DISTDIR):
- mkdir -p $(DISTDIR)
-
-$(BUILD_DIR):
- mkdir -p $(BUILD_DIR)
-
-$(TARGET_DIR):
- mkdir -p $(TARGET_DIR)
-
-$(PACKAGE_DIR):
- mkdir -p ${PACKAGE_DIR}/.stamps
-
${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include} \
${STAGING_HOST_DIR}/{bin,lib}
@@ -564,11 +553,9 @@ bulkallmod:
done
${TOPDIR}/bin/tools/pkgmaker:
- @mkdir -p $(TOPDIR)/bin/tools
@$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
${TOPDIR}/bin/tools/pkgrebuild:
- @mkdir -p $(TOPDIR)/bin/tools
@$(HOSTCC) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c
package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild
@@ -576,10 +563,7 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TO
@$(TOPDIR)/bin/tools/pkgmaker
@:>.menu
-$(TOPDIR)/bin/tools:
- @mkdir -p $(TOPDIR)/bin/tools
-
-${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/bin/tools
+${TOPDIR}/bin/tools/depmaker:
$(HOSTCC) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c
dep: $(TOPDIR)/bin/tools/depmaker
diff --git a/target/arm/Makefile b/target/arm/Makefile
index c2885e917..141d2c279 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -10,10 +10,7 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/kernel-adk
LOADADDR:=0x20008000
-$(TOOLS_BUILD_DIR):
- @mkdir -p $(TOOLS_BUILD_DIR)
-
-tools-compile: $(TOOLS_BUILD_DIR)
+tools-compile:
$(MAKE) -C ../tools/uboot-mkimage
kernel-install: tools-compile
diff --git a/target/cris/Makefile b/target/cris/Makefile
index 1e072f78e..0b4ba3a4d 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -9,10 +9,7 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
-$(TOOLS_BUILD_DIR):
- @mkdir -p $(TOOLS_BUILD_DIR)
-
-tools-compile: $(TOOLS_BUILD_DIR)
+tools-compile:
$(MAKE) -C ../tools/mkfimage
ifneq ($(ADK_HOST_DARWIN),y)
$(MAKE) -C ../tools/e100boot prepare compile install
diff --git a/target/mipsel/Makefile b/target/mipsel/Makefile
index cdf32c088..b04bc9011 100644
--- a/target/mipsel/Makefile
+++ b/target/mipsel/Makefile
@@ -15,10 +15,7 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/vmlinux
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-$(TOOLS_BUILD_DIR):
- @mkdir -p $(TOOLS_BUILD_DIR)
-
-tools-compile: $(TOOLS_BUILD_DIR)
+tools-compile:
$(MAKE) -C ../tools/trx
$(MAKE) -C ../tools/addpattern
$(MAKE) -C ../tools/srec2bin
diff --git a/tools/adk/Makefile b/tools/adk/Makefile
index a7dee6a2e..1f8c2186e 100644
--- a/tools/adk/Makefile
+++ b/tools/adk/Makefile
@@ -3,18 +3,15 @@
include $(TOPDIR)/rules.mk
-$(TOPDIR)/bin/tools:
- @mkdir -p $(TOPDIR)/bin/tools
-
CCANDLD.c= ${HOSTCC} ${HOSTCFLAGS} ${HOSTCPPFLAGS} ${HOSTLDFLAGS}
-${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/bin/tools
+${TOPDIR}/bin/tools/depmaker:
${CCANDLD.c} -o $(TOPDIR)/bin/tools/depmaker depmaker.c
-${TOPDIR}/bin/tools/pkgrebuild: $(TOPDIR)/bin/tools
+${TOPDIR}/bin/tools/pkgrebuild:
${CCANDLD.c} -o $(TOPDIR)/bin/tools/pkgrebuild pkgrebuild.c strmap.c
-${TOPDIR}/bin/tools/dkgetsz: ${TOPDIR}/bin/tools
+${TOPDIR}/bin/tools/dkgetsz:
${CCANDLD.c} -Wall -o $@ dkgetsz.c
install: ${TOPDIR}/bin/tools/depmaker ${TOPDIR}/bin/tools/pkgrebuild \
diff --git a/tools/cpio/Makefile b/tools/cpio/Makefile
index 142f65b70..bbf138918 100644
--- a/tools/cpio/Makefile
+++ b/tools/cpio/Makefile
@@ -28,7 +28,7 @@ SRCS+= \
src/cpio.c
${TOPDIR}/bin/tools/cpio: ${SRCS}
- @${HOSTCC} ${HOSTCFLAGS} -D_GNU_SOURCE -Isrc -o $@ $^
+ ${HOSTCC} ${HOSTCFLAGS} -D_GNU_SOURCE -Isrc -o $@ $^
install: ${TOPDIR}/bin/tools/cpio
diff --git a/tools/mkcrypt/Makefile b/tools/mkcrypt/Makefile
index 4baf56c44..54548c39e 100644
--- a/tools/mkcrypt/Makefile
+++ b/tools/mkcrypt/Makefile
@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
${TOPDIR}/bin/tools/mkcrypt:
- $(HOSTCC) -o $(TOPDIR)/bin/tools/mkcrypt mkcrypt.c
+ $(HOSTCC) ${HOSTCFLAGS} -o $(TOPDIR)/bin/tools/mkcrypt mkcrypt.c
install: ${TOPDIR}/bin/tools/mkcrypt