aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2018-11-28 10:28:18 +0000
committerRon Yorston <rmy@pobox.com>2018-11-28 10:28:18 +0000
commit2a69a2200a141c1504b662eca64b802cdab71b12 (patch)
treeeab0cc01852db237a26052a83c8f582ed92b7cd9 /Makefile
parent97ca1f4b955f486cd26461cb09185335483d2921 (diff)
parent572dfb8e78323b9837f7c5e3369ee233a440b8f2 (diff)
downloadbusybox-w32-2a69a2200a141c1504b662eca64b802cdab71b12.tar.gz
busybox-w32-2a69a2200a141c1504b662eca64b802cdab71b12.tar.bz2
busybox-w32-2a69a2200a141c1504b662eca64b802cdab71b12.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b6aa3f158..d6e84984e 100644
--- a/Makefile
+++ b/Makefile
@@ -363,7 +363,7 @@ scripts/basic/%: scripts_basic ;
363 363
364# This target generates Kbuild's and Config.in's from *.c files 364# This target generates Kbuild's and Config.in's from *.c files
365PHONY += gen_build_files 365PHONY += gen_build_files
366gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) 366gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard $(srctree)/embed/*)
367 $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree) 367 $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
368 368
369# bbox: we have helpers in applets/ 369# bbox: we have helpers in applets/
@@ -854,11 +854,14 @@ quiet_cmd_gen_common_bufsiz = GEN include/common_bufsiz.h
854 cmd_gen_common_bufsiz = $(srctree)/scripts/generate_BUFSIZ.sh include/common_bufsiz.h 854 cmd_gen_common_bufsiz = $(srctree)/scripts/generate_BUFSIZ.sh include/common_bufsiz.h
855quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/* 855quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/*
856 cmd_split_autoconf = scripts/basic/split-include include/autoconf.h include/config 856 cmd_split_autoconf = scripts/basic/split-include include/autoconf.h include/config
857quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h
858 cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh
857#bbox# piggybacked generation of few .h files 859#bbox# piggybacked generation of few .h files
858include/config/MARKER: scripts/basic/split-include include/autoconf.h 860include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard $(srctree)/embed/*) $(wildcard $(srctree)/applets_sh/*) $(srctree)/scripts/embedded_scripts
859 $(call cmd,split_autoconf) 861 $(call cmd,split_autoconf)
860 $(call cmd,gen_bbconfigopts) 862 $(call cmd,gen_bbconfigopts)
861 $(call cmd,gen_common_bufsiz) 863 $(call cmd,gen_common_bufsiz)
864 $(call cmd,gen_embedded_scripts)
862 @touch $@ 865 @touch $@
863 866
864# Generate some files 867# Generate some files
@@ -978,6 +981,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
978 include/autoconf.h \ 981 include/autoconf.h \
979 include/bbconfigopts.h \ 982 include/bbconfigopts.h \
980 include/bbconfigopts_bz2.h \ 983 include/bbconfigopts_bz2.h \
984 include/embedded_scripts.h \
981 include/usage_compressed.h \ 985 include/usage_compressed.h \
982 include/applet_tables.h \ 986 include/applet_tables.h \
983 include/applets.h \ 987 include/applets.h \