projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
httpd: support for "I:index.xml" syntax (Peter Korsgaard <jacmet@uclibc.org>)
[oweals/busybox.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 4f45ae8221990f6dca71a7608f2b535c7017e8da..eabc21b2cbf8efb8ae87e90d31bca3e955f2b5b6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
VERSION = 1
VERSION = 1
-PATCHLEVEL =
6
+PATCHLEVEL =
10
SUBLEVEL = 0
EXTRAVERSION = .svn
NAME = Unnamed
SUBLEVEL = 0
EXTRAVERSION = .svn
NAME = Unnamed
@@
-183,11
+183,6
@@
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
else if [ -x /bin/bash ]; then echo /bin/bash; \
else echo sh; fi ; fi)
else if [ -x /bin/bash ]; then echo /bin/bash; \
else echo sh; fi ; fi)
-HOSTCC = gcc
-HOSTCXX = g++
-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-HOSTCXXFLAGS = -O2
-
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
@@
-262,9
+257,16
@@
export quiet Q KBUILD_VERBOSE
# Look for make include files relative to root of kernel src
MAKEFLAGS += --include-dir=$(srctree)
# Look for make include files relative to root of kernel src
MAKEFLAGS += --include-dir=$(srctree)
+HOSTCC = gcc
+HOSTCXX = g++
+HOSTCFLAGS :=
+HOSTCXXFLAGS :=
# We need some generic definitions
include $(srctree)/scripts/Kbuild.include
# We need some generic definitions
include $(srctree)/scripts/Kbuild.include
+HOSTCFLAGS += $(call hostcc-option,-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer,)
+HOSTCXXFLAGS += -O2
+
# For maximum performance (+ possibly random breakage, uncomment
# the following)
# For maximum performance (+ possibly random breakage, uncomment
# the following)
@@
-317,6
+319,7
@@
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \
export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
+export FLTFLAGS
# When compiling out-of-tree modules, put MODVERDIR in the module
# tree rather than in the kernel tree. The kernel tree might
# When compiling out-of-tree modules, put MODVERDIR in the module
# tree rather than in the kernel tree. The kernel tree might
@@
-434,6
+437,7
@@
libs-y := \
editors/ \
findutils/ \
init/ \
editors/ \
findutils/ \
init/ \
+ ipsvd/ \
libbb/ \
libpwdgrp/ \
loginutils/ \
libbb/ \
libpwdgrp/ \
loginutils/ \
@@
-564,11
+568,13
@@
busybox-all := $(core-y) $(libs-y)
# Rule to link busybox - also used during CONFIG_KALLSYMS
# May be overridden by arch/$(ARCH)/Makefile
quiet_cmd_busybox__ ?= LINK $@
# Rule to link busybox - also used during CONFIG_KALLSYMS
# May be overridden by arch/$(ARCH)/Makefile
quiet_cmd_busybox__ ?= LINK $@
- cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
- -o $@ -Wl,-M \
- -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
- -Wl,--start-group $(busybox-all) -Wl,--end-group \
- $(LDLIBS)
+ cmd_busybox__ ?= $(srctree)/scripts/trylink \
+ "$@" \
+ "$(CC)" \
+ "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
+ "$(core-y)" \
+ "$(libs-y)" \
+ "$(LDLIBS)"
# Generate System.map
quiet_cmd_sysmap = SYSMAP
# Generate System.map
quiet_cmd_sysmap = SYSMAP
@@
-675,8
+681,12
@@
busybox_unstripped: $(busybox-all) FORCE
$(Q)rm -f .old_version
busybox: busybox_unstripped
$(Q)rm -f .old_version
busybox: busybox_unstripped
+ifeq ($(SKIP_STRIP),y)
+ $(Q)cp $< $@
+else
$(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
busybox_unstripped -o $@
$(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
busybox_unstripped -o $@
+endif
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
@@
-752,7
+762,7
@@
PHONY += prepare-all
# 2) Create the include2 directory, used for the second asm symlink
prepare3: .kernelrelease
ifneq ($(KBUILD_SRC),)
# 2) Create the include2 directory, used for the second asm symlink
prepare3: .kernelrelease
ifneq ($(KBUILD_SRC),)
- @echo ' Using $(srctree) as source for
kernel
'
+ @echo ' Using $(srctree) as source for
busybox
'
$(Q)if [ -f $(srctree)/.config ]; then \
echo " $(srctree) is not clean, please run 'make mrproper'";\
echo " in the '$(srctree)' directory.";\
$(Q)if [ -f $(srctree)/.config ]; then \
echo " $(srctree) is not clean, please run 'make mrproper'";\
echo " in the '$(srctree)' directory.";\
@@
-918,6
+928,8
@@
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/autoconf.h \
include/bbconfigopts.h \
include/usage_compressed.h \
include/autoconf.h \
include/bbconfigopts.h \
include/usage_compressed.h \
+ include/applet_tables.h \
+ applets/usage \
.kernelrelease Module.symvers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules
.kernelrelease Module.symvers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules
@@
-960,7
+972,7
@@
distclean: mrproper
@find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
@find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
- -o -name '.*.rej' -o -size 0 \
+ -o -name '.*.rej' -o -
name '*.tmp' -o -
size 0 \
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f