From f3d28845f845b64410e292e93e385bb072bf5143 Mon Sep 17 00:00:00 2001
From: Mike Frysinger
Date: Sat, 11 Jun 2005 00:27:50 +0000
Subject: force including of e2fsbb.h and move the HAVE_* defines to it

---
 e2fsprogs/Makefile.in | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'e2fsprogs')

diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in
index 7694765..a369fab 100644
--- a/e2fsprogs/Makefile.in
+++ b/e2fsprogs/Makefile.in
@@ -23,11 +23,11 @@ E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs/
 endif
 srcdir=$(top_srcdir)/e2fsprogs
 
-CFLAGS += -I$(E2FSPROGS_DIR)
+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))
-E2P_OBJS=$(patsubst %.c,%.o, $(E2P_SRCS))
+E2P_SRC     := fgetsetflags.c fgetsetversion.c pf.c iod.c
+E2P_SRCS    := $(patsubst %,e2p/%, $(E2P_SRC))
+E2P_OBJS    := $(patsubst %.c,%.o, $(E2P_SRCS))
 
 E2FSPROGS-:=
 E2FSPROGS-$(CONFIG_CHATTR)      += chattr.o $(E2P_OBJS)
@@ -40,5 +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) -DHAVE_ERRNO_H=1 -DHAVE_UNISTD_H=1 \
-		-DHAVE_EXT2_IOCTLS=1 -DHAVE_EXT2_IOCTLS=1 -c -o $@ $<
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-- 
cgit v1.1