X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Ftoplevel.mk;h=24e4ebf823fbb304fd32c67815596803890a367c;hb=cdeb2322eab605639f1545a2eee0625424cedf03;hp=3844f3cfc1414ebf7a1a33c8725e99071c3bcb5b;hpb=5b728074160bb1db064737baf95945ae2e972549;p=openwrt%2Fstaging%2Fdedeckeh.git diff --git a/include/toplevel.mk b/include/toplevel.mk index 3844f3cfc1..24e4ebf823 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -16,13 +16,14 @@ ifeq ($(SDK),1) include $(TOPDIR)/include/version.mk else REVISION:=$(shell $(TOPDIR)/scripts/getver.sh) + SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh) endif HOSTCC ?= $(CC) export REVISION +export SOURCE_DATE_EPOCH export GIT_CONFIG_PARAMETERS='core.autocrlf=false' export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS)) -export SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh) # prevent perforce from messing with the patch utility unexport P4PORT P4USER P4CONFIG P4CLIENT @@ -66,7 +67,7 @@ SUBMAKE:=umask 022; $(SUBMAKE) ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024 ] || ulimit -n 1024; -prepare-mk: FORCE ; +prepare-mk: staging_dir/host/.prereq-build FORCE ; ifdef SDK IGNORE_PACKAGES = linux @@ -110,7 +111,7 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - @if [ -s .config -a -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi + @if [ ! -s .config -a -e $(HOME)/.openwrt/defconfig ]; then cp $(HOME)/.openwrt/defconfig .config; fi $< --defconfig=.config Config.in confdefault-y=allyes @@ -178,6 +179,9 @@ clean dirclean: .config prereq:: prepare-tmpinfo .config @+$(NO_TRACE_MAKE) -r -s $@ +check: .config FORCE + @+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s + WARN_PARALLEL_ERROR = $(if $(BUILD_LOG),,$(and $(filter -j,$(MAKEFLAGS)),$(findstring s,$(OPENWRT_VERBOSE)))) ifeq ($(SDK),1) @@ -222,12 +226,6 @@ package/symlinks-clean: help: cat README -docs docs/compile: FORCE - @$(_SINGLE)$(SUBMAKE) -C docs compile - -docs/clean: FORCE - @$(_SINGLE)$(SUBMAKE) -C docs clean - distclean: rm -rf bin build_dir .config* dl feeds key-build* logs package/feeds package/openwrt-packages staging_dir tmp @$(_SINGLE)$(SUBMAKE) -C scripts/config clean