|
@@ -22,12 +22,12 @@
|
|
# You shouldn't need to mess with anything beyond this point...
|
|
# You shouldn't need to mess with anything beyond this point...
|
|
#--------------------------------------------------------------
|
|
#--------------------------------------------------------------
|
|
TOPDIR=./
|
|
TOPDIR=./
|
|
-CONFIG_CONFIG_IN = Config.in
|
|
|
|
-CONFIG_DEFCONFIG = .defconfig
|
|
|
|
-CONFIG = package/config
|
|
|
|
|
|
+CONFIG_CONFIG_IN=Config.in
|
|
|
|
+CONFIG_DEFCONFIG=.defconfig
|
|
|
|
+CONFIG=package/config
|
|
DATE:=$(shell date -u +%Y%m%d)
|
|
DATE:=$(shell date -u +%Y%m%d)
|
|
|
|
|
|
-noconfig_targets := menuconfig config oldconfig randconfig \
|
|
|
|
|
|
+noconfig_targets:=menuconfig config oldconfig randconfig \
|
|
defconfig allyesconfig allnoconfig release tags \
|
|
defconfig allyesconfig allnoconfig release tags \
|
|
source-check help
|
|
source-check help
|
|
|
|
|
|
@@ -45,24 +45,24 @@ endif
|
|
# Use 'make V=1' to see the full commands
|
|
# Use 'make V=1' to see the full commands
|
|
ifdef V
|
|
ifdef V
|
|
ifeq ("$(origin V)", "command line")
|
|
ifeq ("$(origin V)", "command line")
|
|
- KBUILD_VERBOSE = $(V)
|
|
|
|
|
|
+ KBUILD_VERBOSE=$(V)
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
ifndef KBUILD_VERBOSE
|
|
ifndef KBUILD_VERBOSE
|
|
- KBUILD_VERBOSE = 0
|
|
|
|
|
|
+ KBUILD_VERBOSE=0
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(KBUILD_VERBOSE),1)
|
|
ifeq ($(KBUILD_VERBOSE),1)
|
|
quiet=
|
|
quiet=
|
|
- Q =
|
|
|
|
|
|
+ Q=
|
|
else
|
|
else
|
|
quiet=quiet_
|
|
quiet=quiet_
|
|
- Q = @
|
|
|
|
|
|
+ Q=@
|
|
endif
|
|
endif
|
|
|
|
|
|
-CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
|
|
|
|
|
+CONFIG_SHELL:=$(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
|
else if [ -x /bin/bash ]; then echo /bin/bash; \
|
|
else if [ -x /bin/bash ]; then echo /bin/bash; \
|
|
- else echo sh; fi ; fi)
|
|
|
|
|
|
+ else echo sh; fi; fi)
|
|
|
|
|
|
export CONFIG_SHELL quiet Q KBUILD_VERBOSE
|
|
export CONFIG_SHELL quiet Q KBUILD_VERBOSE
|
|
|
|
|
|
@@ -85,12 +85,12 @@ endif
|
|
ifndef HOSTLN
|
|
ifndef HOSTLN
|
|
HOSTLN:=ln
|
|
HOSTLN:=ln
|
|
endif
|
|
endif
|
|
-HOSTAR :=$(shell $(CONFIG_SHELL) -c "which $(HOSTAR)" || type -p $(HOSTAR) || echo ar)
|
|
|
|
-HOSTAS :=$(shell $(CONFIG_SHELL) -c "which $(HOSTAS)" || type -p $(HOSTAS) || echo as)
|
|
|
|
-HOSTCC :=$(shell $(CONFIG_SHELL) -c "which $(HOSTCC)" || type -p $(HOSTCC) || echo gcc)
|
|
|
|
|
|
+HOSTAR:=$(shell $(CONFIG_SHELL) -c "which $(HOSTAR)" || type -p $(HOSTAR) || echo ar)
|
|
|
|
+HOSTAS:=$(shell $(CONFIG_SHELL) -c "which $(HOSTAS)" || type -p $(HOSTAS) || echo as)
|
|
|
|
+HOSTCC:=$(shell $(CONFIG_SHELL) -c "which $(HOSTCC)" || type -p $(HOSTCC) || echo gcc)
|
|
HOSTCXX:=$(shell $(CONFIG_SHELL) -c "which $(HOSTCXX)" || type -p $(HOSTCXX) || echo g++)
|
|
HOSTCXX:=$(shell $(CONFIG_SHELL) -c "which $(HOSTCXX)" || type -p $(HOSTCXX) || echo g++)
|
|
-HOSTLD :=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld)
|
|
|
|
-HOSTLN :=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln)
|
|
|
|
|
|
+HOSTLD:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLD)" || type -p $(HOSTLD) || echo ld)
|
|
|
|
+HOSTLN:=$(shell $(CONFIG_SHELL) -c "which $(HOSTLN)" || type -p $(HOSTLN) || echo ln)
|
|
ifndef CFLAGS_FOR_BUILD
|
|
ifndef CFLAGS_FOR_BUILD
|
|
CFLAGS_FOR_BUILD:=-g -O2
|
|
CFLAGS_FOR_BUILD:=-g -O2
|
|
endif
|
|
endif
|
|
@@ -100,10 +100,10 @@ export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTLD
|
|
ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
|
|
ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
|
|
|
|
|
|
# cc-option
|
|
# cc-option
|
|
-# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
|
|
|
|
|
|
+# Usage: cflags-y+=$(call cc-option, -march=winchip-c6, -march=i586)
|
|
# sets -march=winchip-c6 if supported else falls back to -march=i586
|
|
# sets -march=winchip-c6 if supported else falls back to -march=i586
|
|
# without checking the latter.
|
|
# without checking the latter.
|
|
-cc-option = $(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
|
|
|
|
|
|
+cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
|
|
> /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
|
|
> /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
|
|
|
|
|
|
#############################################################
|
|
#############################################################
|
|
@@ -163,7 +163,7 @@ BASE_TARGETS:=uclibc
|
|
endif
|
|
endif
|
|
TARGETS:=
|
|
TARGETS:=
|
|
|
|
|
|
-# setup uor pathes
|
|
|
|
|
|
+# setup our pathes
|
|
include project/Makefile.in
|
|
include project/Makefile.in
|
|
|
|
|
|
BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
|
|
BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
|
|
@@ -261,9 +261,9 @@ $(PROJECT_BUILD_DIR)/.root:
|
|
mkdir -p $(TARGET_DIR)
|
|
mkdir -p $(TARGET_DIR)
|
|
if ! [ -d "$(TARGET_DIR)/bin" ]; then \
|
|
if ! [ -d "$(TARGET_DIR)/bin" ]; then \
|
|
if [ -d "$(TARGET_SKELETON)" ]; then \
|
|
if [ -d "$(TARGET_SKELETON)" ]; then \
|
|
- cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/ ; \
|
|
|
|
|
|
+ cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
|
|
fi; \
|
|
fi; \
|
|
- touch $(STAGING_DIR)/.fakeroot.00000 ; \
|
|
|
|
|
|
+ touch $(STAGING_DIR)/.fakeroot.00000; \
|
|
fi
|
|
fi
|
|
-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
|
|
-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
|
|
-find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
|
|
-find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
|
|
@@ -321,13 +321,13 @@ export HOSTCFLAGS
|
|
$(CONFIG)/conf:
|
|
$(CONFIG)/conf:
|
|
@mkdir -p $(CONFIG)/buildroot-config
|
|
@mkdir -p $(CONFIG)/buildroot-config
|
|
$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf
|
|
$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf
|
|
- -@if [ ! -f .config ] ; then \
|
|
|
|
|
|
+ -@if [ ! -f .config ]; then \
|
|
cp $(CONFIG_DEFCONFIG) .config; \
|
|
cp $(CONFIG_DEFCONFIG) .config; \
|
|
fi
|
|
fi
|
|
$(CONFIG)/mconf:
|
|
$(CONFIG)/mconf:
|
|
@mkdir -p $(CONFIG)/buildroot-config
|
|
@mkdir -p $(CONFIG)/buildroot-config
|
|
$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf mconf
|
|
$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf mconf
|
|
- -@if [ ! -f .config ] ; then \
|
|
|
|
|
|
+ -@if [ ! -f .config ]; then \
|
|
cp $(CONFIG_DEFCONFIG) .config; \
|
|
cp $(CONFIG_DEFCONFIG) .config; \
|
|
fi
|
|
fi
|
|
|
|
|
|
@@ -388,7 +388,7 @@ source-check: allyesconfig
|
|
#############################################################
|
|
#############################################################
|
|
clean:
|
|
clean:
|
|
rm -f .config .config.old .config.cmd .tmpconfig.h
|
|
rm -f .config .config.old .config.cmd .tmpconfig.h
|
|
- - $(MAKE) -C $(CONFIG) clean
|
|
|
|
|
|
+ -$(MAKE) -C $(CONFIG) clean
|
|
|
|
|
|
distclean: clean
|
|
distclean: clean
|
|
rm -rf sources/*
|
|
rm -rf sources/*
|
|
@@ -420,5 +420,3 @@ help:
|
|
|
|
|
|
.PHONY: dummy subdirs release distclean clean config oldconfig \
|
|
.PHONY: dummy subdirs release distclean clean config oldconfig \
|
|
menuconfig tags check test depend defconfig help
|
|
menuconfig tags check test depend defconfig help
|
|
-
|
|
|
|
-
|
|
|