summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2005-05-11 23:20:09 +0000
committerEric Andersen2005-05-11 23:20:09 +0000
commit9cc7f3230a2e30d0d5b84cb591992fa445aa8a73 (patch)
tree7c7465be71e13204feaed18259b18898d29813b9
parent2acfd7bd2640655138260e0661990e12a99c57d3 (diff)
downloadbusybox-9cc7f3230a2e30d0d5b84cb591992fa445aa8a73.zip
busybox-9cc7f3230a2e30d0d5b84cb591992fa445aa8a73.tar.gz
This makefile was a mess. Fix it to work as intended.
-Erik
-rw-r--r--e2fsprogs/Makefile.in22
1 files changed, 11 insertions, 11 deletions
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in
index f4137e9..d9856a2 100644
--- a/e2fsprogs/Makefile.in
+++ b/e2fsprogs/Makefile.in
@@ -23,22 +23,22 @@ E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs/
endif
srcdir=$(top_srcdir)/e2fsprogs
+
+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.o
-E2FSPROGS-$(CONFIG_LSATTR) += lsattr.o e2p.o
+E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS)
+E2FSPROGS-$(CONFIG_LSATTR) += lsattr.o $(E2P_OBJS)
libraries-y+=$(E2FSPROGS_DIR)$(E2FSPROGS_AR)
+
$(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) -c -o $@ $<
-
-E2P_SRC_LIST := \
- fgetsetflags.c fgetsetversion.c \
- pf.c iod.c
-E2P_SRC := $(patsubst %, $(E2FSPROGS_DIR)/e2p/%, $(E2P_SRC_LIST))
-$(E2FSPROGS_DIR)e2p.o: $(E2P_SRC)
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $(E2P_SRC) \
- -DHAVE_ERRNO_H=1 -DHAVE_UNISTD_H=1 -DHAVE_EXT2_IOCTLS=1 -DHAVE_EXT2_IOCTLS=1
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -DHAVE_ERRNO_H=1 -DHAVE_UNISTD_H=1 \
+ -DHAVE_EXT2_IOCTLS=1 -DHAVE_EXT2_IOCTLS=1 -c -o $@ $<
+