[BusyBox-cvs] svn commit: trunk/busybox/e2fsprogs

[vapier at busybox.net]

Author: vapier
Date: 2005-06-10 18:27:50 -0600 (Fri, 10 Jun 2005)
New Revision: 10520

Log:
force including of e2fsbb.h and move the HAVE_* defines to it

Modified:
   trunk/busybox/e2fsprogs/Makefile.in


Changeset:
Modified: trunk/busybox/e2fsprogs/Makefile.in
===================================================================
--- trunk/busybox/e2fsprogs/Makefile.in	2005-06-11 00:24:20 UTC (rev 10519)
+++ trunk/busybox/e2fsprogs/Makefile.in	2005-06-11 00:27:50 UTC (rev 10520)
@@ -23,11 +23,11 @@
 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 @@
 	$(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 $@ $<