diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-05-11 04:39:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-05-11 04:39:09 +0000 |
| commit | d148a94a2a7b560e1dab792f95130a55dba4ee58 (patch) | |
| tree | bcfafd63eddf9fd5d8000f24405b918397cf70a3 | |
| parent | be7c539b7aae2b0f3f1e2f70755cea6f9a19353b (diff) | |
| download | busybox-d148a94a2a7b560e1dab792f95130a55dba4ee58.tar.gz | |
move the dir related rules to the end so the E2FSPROGS_AR rule is the default
| -rw-r--r-- | e2fsprogs/Makefile.in | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index b504975db..468888432 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in @@ -39,21 +39,6 @@ UUID_SRC := compare.c gen_uuid.c pack.c parse.c unpack.c unparse.c \ UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC)) UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS)) -# for building out-of-tree we need to make sure that the directories to hold -# the object tree are created -$(patsubst %,$(E2FSPROGS_DIR)/%, blkid e2fsck e2p ext2fs uuid): - @mkdir -p "$@" - -# make sure that the directories are order-only prerequisites. Otherwise we -# may have object files created after the timestamp of the directory was -# updated which would lead to spurious rebuilds (as some of the dentries -# may be older than the dir itself). -$(patsubst %,$(E2FSPROGS_DIR)/%, $(BLKID_OBJS)):|$(E2FSPROGS_DIR)/blkid -$(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSCK_OBJS)):|$(E2FSPROGS_DIR)/e2fsck -$(patsubst %,$(E2FSPROGS_DIR)/%, $(E2P_OBJS)):|$(E2FSPROGS_DIR)/e2p -$(patsubst %,$(E2FSPROGS_DIR)/%, $(EXT2FS_OBJS)):|$(E2FSPROGS_DIR)/ext2fs -$(patsubst %,$(E2FSPROGS_DIR)/%, $(UUID_OBJS)):|$(E2FSPROGS_DIR)/uuid - E2FSPROGS-y:= E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) @@ -84,3 +69,18 @@ $(E2FSPROGS_DIR)/$(E2FSPROGS_AR): $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSPROGS-y $(E2FSPROGS_DIR)/%.o: $(subst $(top_builddir),$(top_srcdir),$(E2FSPROGS_DIR)/%.c) $(compile.c) $(E2FSPROGS_CFLAGS) + +# for building out-of-tree we need to make sure that the directories to hold +# the object tree are created +$(patsubst %,$(E2FSPROGS_DIR)/%, blkid e2fsck e2p ext2fs uuid): + @mkdir -p "$@" + +# make sure that the directories are order-only prerequisites. Otherwise we +# may have object files created after the timestamp of the directory was +# updated which would lead to spurious rebuilds (as some of the dentries +# may be older than the dir itself). +$(patsubst %,$(E2FSPROGS_DIR)/%, $(BLKID_OBJS)):|$(E2FSPROGS_DIR)/blkid +$(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSCK_OBJS)):|$(E2FSPROGS_DIR)/e2fsck +$(patsubst %,$(E2FSPROGS_DIR)/%, $(E2P_OBJS)):|$(E2FSPROGS_DIR)/e2p +$(patsubst %,$(E2FSPROGS_DIR)/%, $(EXT2FS_OBJS)):|$(E2FSPROGS_DIR)/ext2fs +$(patsubst %,$(E2FSPROGS_DIR)/%, $(UUID_OBJS)):|$(E2FSPROGS_DIR)/uuid |