clean up commented out old code

[oweals/busybox.git] / Makefile.flags

diff --git a/Makefile.flags b/Makefile.flags
index 200cf70c728035b32c0f9a3f2fbd6cb8bcc26030..669e30cfcfbfa42fc2ad9a3c3bae92dfd8fb2b1e 100644 (file)
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -4,15 +4,34 @@
 
 BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
+# -std=gnu99 needed for [U]LLONG_MAX on some systems
+
 CPPFLAGS += \
+       -std=gnu99 \
        -Iinclude -Ilibbb \
        $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) -I$(srctree)/libbb \
        -include include/autoconf.h \
        -D_GNU_SOURCE -DNDEBUG \
        $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
-       -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP \
-       -Wall -Wstrict-prototypes -Wshadow -Werror \
+       -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP
+
+CFLAGS += \
+       -Wall -Wshadow -Wno-error -Wundef \
+       -Wold-style-definition \
+       -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
        -funsigned-char -fno-builtin-strlen -finline-limit=0 -static-libgcc \
        -Os -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-       -fomit-frame-pointer -ffunction-sections -fdata-sections \
-       -funsigned-char -fno-builtin-strlen \
+       -fomit-frame-pointer -ffunction-sections -fdata-sections
+# FIXME: These warnings are at least partially to be concerned about and should
+# be fixed..
+#CFLAGS+=-Wconversion
+
+
+ifeq ($(CONFIG_DEBUG),y)
+CFLAGS += -g
+endif
+
+ifeq ($(CONFIG_STATIC),y)
+LDFLAGS += -static
+endif
+#LDFLAGS += -nostdlib