d148a94a2
Mike Frysinger
2006-05-11
Subject
move the dir related rules to the end so the E2FSPROGS_AR rule is the default
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
e2fsprogs/Makefile.in+15 -15
| @@ -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 |