projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ash: fix mishandling of bash-style redirects
[oweals/busybox.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 0d6e17d04cabb6c381bc8da011824b88d969c32a..3a49a6971776d7cb88d239ab631b260482226f85 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 1
VERSION = 1
-PATCHLEVEL = 1
4
+PATCHLEVEL = 1
6
SUBLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION =
.git
NAME = Unnamed
# *DOCUMENTATION*
NAME = Unnamed
# *DOCUMENTATION*
@@
-358,6
+358,15
@@
scripts_basic:
# To avoid any implicit rule to kick in, define an empty command.
scripts/basic/%: scripts_basic ;
# To avoid any implicit rule to kick in, define an empty command.
scripts/basic/%: scripts_basic ;
+# bbox: we have helpers in applets/
+# we depend on scripts_basic, since scripts/basic/fixdep
+# must be built before any other host prog
+PHONY += applets_dir
+applets_dir: scripts_basic
+ $(Q)$(MAKE) $(build)=applets
+
+applets/%: applets_dir ;
+
PHONY += outputmakefile
# outputmakefile generates a Makefile in the output directory, if using a
# separate output directory. This allows convenient use of make in the
PHONY += outputmakefile
# outputmakefile generates a Makefile in the output directory, if using a
# separate output directory. This allows convenient use of make in the
@@
-797,7
+806,7
@@
ifneq ($(KBUILD_MODULES),)
$(Q)rm -f $(MODVERDIR)/*
endif
$(Q)rm -f $(MODVERDIR)/*
endif
-archprepare: prepare1 scripts_basic
+archprepare: prepare1 scripts_basic
applets_dir
prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.