diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-06-11 00:27:50 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-06-11 00:27:50 +0000 |
| commit | f3d28845f845b64410e292e93e385bb072bf5143 (patch) | |
| tree | ded55427c5c8c9267d486ebc21eec29bef27b22c | |
| parent | e9903cfa0f0902172563925355db6243cdd917e4 (diff) | |
| download | busybox-w32-f3d28845f845b64410e292e93e385bb072bf5143.tar.gz busybox-w32-f3d28845f845b64410e292e93e385bb072bf5143.tar.bz2 busybox-w32-f3d28845f845b64410e292e93e385bb072bf5143.zip | |
force including of e2fsbb.h and move the HAVE_* defines to it
| -rw-r--r-- | e2fsprogs/Makefile.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index 7694765c9..a369fabd7 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in | |||
| @@ -23,11 +23,11 @@ E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs/ | |||
| 23 | endif | 23 | endif |
| 24 | srcdir=$(top_srcdir)/e2fsprogs | 24 | srcdir=$(top_srcdir)/e2fsprogs |
| 25 | 25 | ||
| 26 | CFLAGS += -I$(E2FSPROGS_DIR) | 26 | CFLAGS += -I$(E2FSPROGS_DIR) -include $(E2FSPROGS_DIR)e2fsbb.h |
| 27 | 27 | ||
| 28 | E2P_SRC:=fgetsetflags.c fgetsetversion.c pf.c iod.c | 28 | E2P_SRC := fgetsetflags.c fgetsetversion.c pf.c iod.c |
| 29 | E2P_SRCS:=$(patsubst %,e2p/%, $(E2P_SRC)) | 29 | E2P_SRCS := $(patsubst %,e2p/%, $(E2P_SRC)) |
| 30 | E2P_OBJS=$(patsubst %.c,%.o, $(E2P_SRCS)) | 30 | E2P_OBJS := $(patsubst %.c,%.o, $(E2P_SRCS)) |
| 31 | 31 | ||
| 32 | E2FSPROGS-:= | 32 | E2FSPROGS-:= |
| 33 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) | 33 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) |
| @@ -40,5 +40,4 @@ $(E2FSPROGS_DIR)$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y)) | |||
| 40 | $(AR) -ro $@ $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y)) | 40 | $(AR) -ro $@ $(patsubst %,$(E2FSPROGS_DIR)%, $(E2FSPROGS-y)) |
| 41 | 41 | ||
| 42 | $(E2FSPROGS_DIR)%.o: $(srcdir)/%.c | 42 | $(E2FSPROGS_DIR)%.o: $(srcdir)/%.c |
| 43 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DHAVE_ERRNO_H=1 -DHAVE_UNISTD_H=1 \ | 43 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< |
| 44 | -DHAVE_EXT2_IOCTLS=1 -DHAVE_EXT2_IOCTLS=1 -c -o $@ $< | ||