diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-11-19 13:31:28 -0500 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-11-21 14:15:21 +0200 |
| commit | c3d328ca27b31dad62ab7ca3edf55087352d27a8 (patch) | |
| tree | 7c3f3420ff108b5d3e4957c5db933d123c7c6fe6 /ubi-utils | |
| parent | c75b917f08b8ae070e61b57166b85a93eeea184f (diff) | |
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 <nico@marvell.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'ubi-utils')
| -rw-r--r-- | ubi-utils/new-utils/Makefile | 6 |
1 files 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 |