aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-06-12 07:49:08 +1000
committerJosh Boyer <jwboyer@gmail.com>2008-06-18 08:58:52 -0400
commita8523b2d61e2eb750447c57bff1f5fcae33ef8fc (patch)
tree7d7bef5378d7bc5673c12f47db0ab0ba5e3b957a
parentb1da3d54f1dd2e1dc0316480cb0b6376d37e1cb5 (diff)
respect CFLAGS/CPPFLAGS from build environment
Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Josh Boyer <jwboyer@gmail.com>
-rw-r--r--Makefile10
-rw-r--r--ubi-utils/Makefile9
2 files changed, 11 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 9f5ef6c..c5d1933 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,15 @@
# -*- sh -*-
-OPTFLAGS := -O2 -Wall
SBINDIR=/usr/sbin
MANDIR=/usr/share/man
INCLUDEDIR=/usr/include
+
#CROSS=arm-linux-
CC := $(CROSS)gcc
-CFLAGS := -I./include $(OPTFLAGS)
+CFLAGS ?= -O2 -g
+CFLAGS += -Wall
+CPPFLAGS += -I./include
ifeq ($(origin CROSS),undefined)
BUILDDIR := .
@@ -17,7 +19,7 @@ else
endif
ifeq ($(WITHOUT_XATTR), 1)
- CFLAGS += -DWITHOUT_XATTR
+ CPPFLAGS += -DWITHOUT_XATTR
endif
RAWTARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
@@ -38,7 +40,7 @@ SYMLINKS =
$(BUILDDIR)/%.o: %.c
mkdir -p $(BUILDDIR)
- $(CC) $(CFLAGS) -g -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< -g -Wp,-MD,$(BUILDDIR)/.$(<F).dep
.SUFFIXES:
diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index 0394eee..3e6203f 100644
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -2,7 +2,6 @@
# Makefile for ubi-utils
#
-OPTFLAGS := -O2 -g -Wall
KERNELHDR := ../include
DESTDIR := /usr/local
SBINDIR=/usr/sbin
@@ -10,8 +9,10 @@ MANDIR=/usr/share/man
INCLUDEDIR=/usr/include
CC := $(CROSS)gcc
-CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) -Werror \
- -Wwrite-strings -W -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
+CFLAGS ?= -O2 -g -Werror
+CFLAGS += -Wall -Wwrite-strings -W
+CPPFLAGS += -I./inc -I./src -I$(KERNELHDR) \
+ -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
PERLPROGS = mkpfi ubicrc32.pl
@@ -26,7 +27,7 @@ vpath %.c ./src
$(CC) $(LDFLAGS) -g -o $@ $^
%.o: %.c
- $(CC) $(CFLAGS) -g -c -o $@ $< -g -Wp,-MD,.$(shell basename $<).dep
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< -g -Wp,-MD,.$(shell basename $<).dep
all: $(TARGETS)
make -C new-utils