projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
httpd: do not set alarm() timeout if we read cached header
[oweals/busybox.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index c38618bed38ce2c88aa472d9413b4c50460440c4..6fedcffba1beb52122095d4e304f43a673de66e9 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 1
VERSION = 1
-PATCHLEVEL =
29
+PATCHLEVEL =
31
SUBLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION =
.git
NAME = Unnamed
# *DOCUMENTATION*
NAME = Unnamed
# *DOCUMENTATION*
@@
-361,7
+361,7
@@
scripts/basic/%: scripts_basic ;
# This target generates Kbuild's and Config.in's from *.c files
PHONY += gen_build_files
# This target generates Kbuild's and Config.in's from *.c files
PHONY += gen_build_files
-gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c)
+gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c)
$(wildcard $(srctree)/embed/*)
$(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
# bbox: we have helpers in applets/
$(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
# bbox: we have helpers in applets/
@@
-850,11
+850,14
@@
quiet_cmd_gen_common_bufsiz = GEN include/common_bufsiz.h
cmd_gen_common_bufsiz = $(srctree)/scripts/generate_BUFSIZ.sh include/common_bufsiz.h
quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/*
cmd_split_autoconf = scripts/basic/split-include include/autoconf.h include/config
cmd_gen_common_bufsiz = $(srctree)/scripts/generate_BUFSIZ.sh include/common_bufsiz.h
quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/*
cmd_split_autoconf = scripts/basic/split-include include/autoconf.h include/config
+quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h
+ cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh
#bbox# piggybacked generation of few .h files
#bbox# piggybacked generation of few .h files
-include/config/MARKER: scripts/basic/split-include include/autoconf.h
+include/config/MARKER: scripts/basic/split-include include/autoconf.h
$(wildcard $(srctree)/embed/*) $(wildcard $(srctree)/applets_sh/*) $(srctree)/scripts/embedded_scripts
$(call cmd,split_autoconf)
$(call cmd,gen_bbconfigopts)
$(call cmd,gen_common_bufsiz)
$(call cmd,split_autoconf)
$(call cmd,gen_bbconfigopts)
$(call cmd,gen_common_bufsiz)
+ $(call cmd,gen_embedded_scripts)
@touch $@
# Generate some files
@touch $@
# Generate some files
@@
-974,6
+977,7
@@
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/autoconf.h \
include/bbconfigopts.h \
include/bbconfigopts_bz2.h \
include/autoconf.h \
include/bbconfigopts.h \
include/bbconfigopts_bz2.h \
+ include/embedded_scripts.h \
include/usage_compressed.h \
include/applet_tables.h \
include/applets.h \
include/usage_compressed.h \
include/applet_tables.h \
include/applets.h \