From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 11 Jun 2005 00:45:50 +0000 (-0000)
Subject: oops, we only want to affect local CFLAGS
X-Git-Tag: 1_1_0~945
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7ffce0c119a9c87e02908f19dae777a1760d9a03;p=oweals%2Fbusybox.git

oops, we only want to affect local CFLAGS
---

diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in
index a369fabd7..5c69fbeef 100644
--- a/e2fsprogs/Makefile.in
+++ b/e2fsprogs/Makefile.in
@@ -23,7 +23,7 @@ E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs/
 endif
 srcdir=$(top_srcdir)/e2fsprogs
 
-CFLAGS += -I$(E2FSPROGS_DIR) -include $(E2FSPROGS_DIR)e2fsbb.h
+E2FSPROGS_CFLAGS := -I$(E2FSPROGS_DIR) -include $(E2FSPROGS_DIR)e2fsbb.h
 
 E2P_SRC     := fgetsetflags.c fgetsetversion.c pf.c iod.c
 E2P_SRCS    := $(patsubst %,e2p/%, $(E2P_SRC))
@@ -40,4 +40,4 @@ $(E2FSPROGS_DIR)$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y))
 	$(AR) -ro $@ $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y))
 
 $(E2FSPROGS_DIR)%.o: $(srcdir)/%.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(E2FSPROGS_CFLAGS) -c -o $@ $<