force including of e2fsbb.h and move the HAVE_* defines to it
No binary (build failed)
—
(log yok)
| @@ -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 $@ $< |