software: cleanup CFLAGS

diff --git a/software/common.mak b/software/common.mak
index 0f904505f077c0ebedb9b4c23be79b278e2b5a37..168dba84ffecd280b8a3835fb274e74440d6b707 100644 (file)
--- a/software/common.mak
+++ b/software/common.mak
@@ -35,11 +35,10 @@ endif
 
 # Toolchain options
 #
-INCLUDES_NOLIBC ?= -nostdinc -I$(M2DIR)/software/include/base
-INCLUDES = $(INCLUDES_NOLIBC) -I$(M2DIR)/software/include -I$(M2DIR)/common
-ASFLAGS = $(INCLUDES) -nostdinc
+INCLUDES = -I$(M2DIR)/software/include/base -I$(M2DIR)/software/include -I$(M2DIR)/common
+ASFLAGS = -nostdinc $(INCLUDES)
 CFLAGS = -O9 -Wall -Wstrict-prototypes -Wold-style-definition -Wshadow \
-        -Wmissing-prototypes -fsigned-char $(INCLUDES)
+        -Wmissing-prototypes -fsigned-char -nostdinc $(INCLUDES)
 LDFLAGS = -nostdlib -nodefaultlibs
 
 # compile and generate dependencies, based on