X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Ftoplevel.mk;h=5e99df8d9e361632b1a3d44263f74aa96ab08ae6;hp=581083d912dee3a9acdb9c159bd0613bada91f11;hb=9bf2bc7587e0553325fe3be93de083ba5a340a16;hpb=9ae952cf8cf2f0d7df95434c8b16d13bc1b47fca diff --git a/include/toplevel.mk b/include/toplevel.mk index 581083d912..5e99df8d9e 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 @@ -110,7 +111,7 @@ config-clean: FORCE defconfig: scripts/config/conf prepare-tmpinfo FORCE touch .config - @if [ -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