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-w32-d148a94a2a7b560e1dab792f95130a55dba4ee58.tar.gz busybox-w32-d148a94a2a7b560e1dab792f95130a55dba4ee58.tar.bz2 busybox-w32-d148a94a2a7b560e1dab792f95130a55dba4ee58.zip |
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 \ | |||
39 | UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC)) | 39 | UUID_SRCS := $(patsubst %,uuid/%, $(UUID_SRC)) |
40 | UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS)) | 40 | UUID_OBJS := $(patsubst %.c,%.o, $(UUID_SRCS)) |
41 | 41 | ||
42 | # for building out-of-tree we need to make sure that the directories to hold | ||
43 | # the object tree are created | ||
44 | $(patsubst %,$(E2FSPROGS_DIR)/%, blkid e2fsck e2p ext2fs uuid): | ||
45 | @mkdir -p "$@" | ||
46 | |||
47 | # make sure that the directories are order-only prerequisites. Otherwise we | ||
48 | # may have object files created after the timestamp of the directory was | ||
49 | # updated which would lead to spurious rebuilds (as some of the dentries | ||
50 | # may be older than the dir itself). | ||
51 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(BLKID_OBJS)):|$(E2FSPROGS_DIR)/blkid | ||
52 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSCK_OBJS)):|$(E2FSPROGS_DIR)/e2fsck | ||
53 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2P_OBJS)):|$(E2FSPROGS_DIR)/e2p | ||
54 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(EXT2FS_OBJS)):|$(E2FSPROGS_DIR)/ext2fs | ||
55 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(UUID_OBJS)):|$(E2FSPROGS_DIR)/uuid | ||
56 | |||
57 | E2FSPROGS-y:= | 42 | E2FSPROGS-y:= |
58 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) | 43 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) |
59 | E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) | 44 | 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 | |||
84 | 69 | ||
85 | $(E2FSPROGS_DIR)/%.o: $(subst $(top_builddir),$(top_srcdir),$(E2FSPROGS_DIR)/%.c) | 70 | $(E2FSPROGS_DIR)/%.o: $(subst $(top_builddir),$(top_srcdir),$(E2FSPROGS_DIR)/%.c) |
86 | $(compile.c) $(E2FSPROGS_CFLAGS) | 71 | $(compile.c) $(E2FSPROGS_CFLAGS) |
72 | |||
73 | # for building out-of-tree we need to make sure that the directories to hold | ||
74 | # the object tree are created | ||
75 | $(patsubst %,$(E2FSPROGS_DIR)/%, blkid e2fsck e2p ext2fs uuid): | ||
76 | @mkdir -p "$@" | ||
77 | |||
78 | # make sure that the directories are order-only prerequisites. Otherwise we | ||
79 | # may have object files created after the timestamp of the directory was | ||
80 | # updated which would lead to spurious rebuilds (as some of the dentries | ||
81 | # may be older than the dir itself). | ||
82 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(BLKID_OBJS)):|$(E2FSPROGS_DIR)/blkid | ||
83 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2FSCK_OBJS)):|$(E2FSPROGS_DIR)/e2fsck | ||
84 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(E2P_OBJS)):|$(E2FSPROGS_DIR)/e2p | ||
85 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(EXT2FS_OBJS)):|$(E2FSPROGS_DIR)/ext2fs | ||
86 | $(patsubst %,$(E2FSPROGS_DIR)/%, $(UUID_OBJS)):|$(E2FSPROGS_DIR)/uuid | ||