From c3d328ca27b31dad62ab7ca3edf55087352d27a8 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Wed, 19 Nov 2008 13:31:28 -0500 Subject: ubi-utils: fix CFLAGS handling wrt cross compilation Let's have the "new ubi-utils" makefile handle CFLAGS like the other makefiles. This is important when cross compiling and CFLAGS is externally provided. Without this, local include files are not found due to the various -I arguments which are then lost. Signed-off-by: Nicolas Pitre Signed-off-by: Artem Bityutskiy --- ubi-utils/new-utils/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubi-utils/new-utils/Makefile b/ubi-utils/new-utils/Makefile index ba4c20f..6fce7c6 100644 --- a/ubi-utils/new-utils/Makefile +++ b/ubi-utils/new-utils/Makefile @@ -2,7 +2,6 @@ # Makefile for ubi-utils # -OPTFLAGS := -O2 -Wall KERNELHDR := ../../include DESTDIR := /usr/local SBINDIR=/usr/sbin @@ -10,7 +9,8 @@ MANDIR=/usr/man INCLUDEDIR=/usr/include CC := $(CROSS)gcc -CFLAGS := -Iinclude -Isrc -I$(KERNELHDR) $(OPTFLAGS) -Werror -Wall +CFLAGS ?= -O2 -Wall +CPPFLAGS := -Iinclude -Isrc -I$(KERNELHDR) $(CFLAGS) -Werror -Wall LIBS = libubi libmtd libubigen libiniparser libscan UTILS = ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \ @@ -26,7 +26,7 @@ all: $(UTILS) # The below is the rule to get an .o file from a .c file %.o: %.c - $(CC) $(CFLAGS) $< -c -o $@ + $(CC) $(CPPFLAGS) $< -c -o $@ # And the below is the rule to get final executable from its .o and common.o %: libubi.a %.o common.o -- cgit v1.2.3