summaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorMike Frysinger2005-06-11 00:27:50 +0000
committerMike Frysinger2005-06-11 00:27:50 +0000
commitf3d28845f845b64410e292e93e385bb072bf5143 (patch)
treeded55427c5c8c9267d486ebc21eec29bef27b22c /e2fsprogs
parente9903cfa0f0902172563925355db6243cdd917e4 (diff)
downloadbusybox-f3d28845f845b64410e292e93e385bb072bf5143.zip
busybox-f3d28845f845b64410e292e93e385bb072bf5143.tar.gz
force including of e2fsbb.h and move the HAVE_* defines to it
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/Makefile.in11
1 files changed, 5 insertions, 6 deletions
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 $@ $<