projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getty: do not emit bogus error message on EOF
[oweals/busybox.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index ffa69484e00df4f4e0904d6cb0d25d5197b0dce7..14f5cd14920714bd52e52adb2e44626748c2d4a9 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 1
VERSION = 1
-PATCHLEVEL = 1
5
+PATCHLEVEL = 1
7
SUBLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION = .
svn
+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
@@
-368,6
+377,11
@@
ifneq ($(KBUILD_SRC),)
$(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
endif
$(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
endif
+# This target generates Kbuild's and Config.in's from *.c files
+PHONY += gen_build_files
+gen_build_files:
+ $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
+
# To make sure we do not include .config for any of the *config targets
# catch them early, and hand them over to scripts/kconfig/Makefile
# It is allowed to specify more targets when calling make, including
# To make sure we do not include .config for any of the *config targets
# catch them early, and hand them over to scripts/kconfig/Makefile
# It is allowed to specify more targets when calling make, including
@@
-419,7
+433,7
@@
ifeq ($(config-targets),1)
-include $(srctree)/arch/$(ARCH)/Makefile
export KBUILD_DEFCONFIG
-include $(srctree)/arch/$(ARCH)/Makefile
export KBUILD_DEFCONFIG
-config %config: scripts_basic outputmakefile FORCE
+config %config: scripts_basic outputmakefile
gen_build_files
FORCE
$(Q)mkdir -p include
$(Q)$(MAKE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
$(Q)mkdir -p include
$(Q)$(MAKE) $(build)=scripts/kconfig $@
$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@
-434,7
+448,7
@@
ifeq ($(KBUILD_EXTMOD),)
# Carefully list dependencies so we do not try to build scripts twice
# in parrallel
PHONY += scripts
# Carefully list dependencies so we do not try to build scripts twice
# in parrallel
PHONY += scripts
-scripts: scripts_basic include/config/MARKER
+scripts:
gen_build_files
scripts_basic include/config/MARKER
$(Q)$(MAKE) $(build)=$(@)
scripts_basic: include/autoconf.h
$(Q)$(MAKE) $(build)=$(@)
scripts_basic: include/autoconf.h
@@
-797,7
+811,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)=.
@@
-987,6
+1001,8
@@
$(mrproper-dirs):
mrproper: clean archmrproper $(mrproper-dirs)
$(call cmd,rmdirs)
$(call cmd,rmfiles)
mrproper: clean archmrproper $(mrproper-dirs)
$(call cmd,rmdirs)
$(call cmd,rmfiles)
+ @find -name Config.src | sed 's/.src$/.in/' | xargs -r rm -f
+ @find -name Kbuild.src | sed 's/.src$//' | xargs -r rm -f
# distclean
#
# distclean
#