more -Wall warning fixes. -Wall is enabled now.

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index cfa1acad9f556132baeb5d613646bd23e633c53d..9c1b49611c2ba50300341cd22da76ea89e5e5656 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 9
+PATCHLEVEL = 11
 SUBLEVEL = 0
 EXTRAVERSION = .svn
 NAME = Unnamed
@@ -361,7 +361,8 @@ endif
 # of make so .config is not included in this case either (for *config).
 
 no-dot-config-targets := clean mrproper distclean \
-                        cscope TAGS tags help %docs check%
+                        cscope TAGS tags help %docs
+#bbox# check% is removed from above
 
 config-targets := 0
 mixed-targets  := 0
@@ -437,7 +438,6 @@ libs-y              := \
                editors/ \
                findutils/ \
                init/ \
-               ipsvd/ \
                libbb/ \
                libpwdgrp/ \
                loginutils/ \
@@ -446,12 +446,14 @@ libs-y            := \
                networking/ \
                networking/libiproute/ \
                networking/udhcp/ \
+               printutils/ \
                procps/ \
                runit/ \
                selinux/ \
                shell/ \
                sysklogd/ \
                util-linux/ \
+               util-linux/volume_id/ \
 
 endif # KBUILD_EXTMOD
 
@@ -496,12 +498,6 @@ all: busybox
 #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
 CHECKFLAGS += $(NOSTDINC_FLAGS)
 
-# warn about C99 declaration after statement
-CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
-
-# disable pointer signedness warnings in gcc 4.0
-CFLAGS += $(call cc-option,-Wno-pointer-sign,)
-
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the commandline or
 # set in the environment
@@ -571,6 +567,7 @@ quiet_cmd_busybox__ ?= LINK    $@
       cmd_busybox__ ?= $(srctree)/scripts/trylink \
       "$@" \
       "$(CC)" \
+      "$(CFLAGS)" \
       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
       "$(core-y)" \
       "$(libs-y)" \
@@ -729,7 +726,7 @@ localver = $(subst $(space),, \
 # Currently, only git is supported.
 # Other SCMs can edit scripts/setlocalversion and add the appropriate
 # checks as needed.
-ifdef CONFIG_LOCALVERSION_AUTO
+ifdef _BB_DISABLED_CONFIG_LOCALVERSION_AUTO
        _localver-auto = $(shell $(CONFIG_SHELL) \
                          $(srctree)/scripts/setlocalversion $(srctree))
        localver-auto  = $(LOCALVERSION)$(_localver-auto)
@@ -842,7 +839,7 @@ depend dep:
 # ---------------------------------------------------------------------------
 # Modules
 
-ifdef CONFIG_MODULES
+ifdef _BB_DISABLED_CONFIG_MODULES
 
 #      By default, build modules as well
 
@@ -928,6 +925,8 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                  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