diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-06 14:20:43 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-06 14:20:43 +0000 |
| commit | 2e9cf373a95b7b73b60e95372c1cc9192ce3ac3f (patch) | |
| tree | 06be1a85c6abc3ae43854ffe6ee40d8bb6e713eb | |
| parent | a59721166afc8be2ce0c454e4e163351ce58d76a (diff) | |
| download | busybox-w32-2e9cf373a95b7b73b60e95372c1cc9192ce3ac3f.tar.gz busybox-w32-2e9cf373a95b7b73b60e95372c1cc9192ce3ac3f.tar.bz2 busybox-w32-2e9cf373a95b7b73b60e95372c1cc9192ce3ac3f.zip | |
- workaround bug in make-3.81beta4:
- has to use
/top/obj/dir/*.o: /top/obj/dir/file.o: /top/src/file.c
instead of the proper
/top/obj/dir/*.o: /top/obj/dir/file.o: /top/src/dir/file.c
| -rw-r--r-- | e2fsprogs/Makefile.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index 8a46af113..c30318b67 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in | |||
| @@ -45,12 +45,22 @@ $(patsubst %,$(objdir)/%, blkid e2fsck e2p ext2fs uuid): | |||
| 45 | # may have object files created after the timestamp of the directory was | 45 | # may have object files created after the timestamp of the directory was |
| 46 | # updated which would lead to spurious rebuilds (as some of the dentries | 46 | # updated which would lead to spurious rebuilds (as some of the dentries |
| 47 | # may be older than the dir itself). | 47 | # may be older than the dir itself). |
| 48 | $(patsubst %,$(objdir)/%,$(BLKID_OBJS)): $(objdir)/blkid/%.o: $(srcdir)/%.c|$(objdir)/blkid | 48 | ifneq ($(MAKE_VERSION),3.81beta4) |
| 49 | # /top/obj/dir/*.o: /top/obj/dir/file.o: /top/src/dir/file.c | ||
| 50 | $(patsubst %,$(objdir)/%,$(BLKID_OBJS)): $(objdir)/blkid/%.o: $(srcdir)/blkid/%.c |$(objdir)/blkid | ||
| 51 | $(patsubst %,$(objdir)/%,$(E2FSCK_OBJS)):$(objdir)/e2fsck/%.o:$(srcdir)/e2fsck/%.c|$(objdir)/e2fsck | ||
| 52 | $(patsubst %,$(objdir)/%,$(E2P_OBJS)): $(objdir)/e2p/%.o: $(srcdir)/e2p/%.c |$(objdir)/e2p | ||
| 53 | $(patsubst %,$(objdir)/%,$(EXT2FS_OBJS)):$(objdir)/ext2fs/%.o:$(srcdir)/ext2fs/%.c|$(objdir)/ext2fs | ||
| 54 | $(patsubst %,$(objdir)/%,$(UUID_OBJS)): $(objdir)/uuid/%.o: $(srcdir)/uuid/%.c |$(objdir)/uuid | ||
| 55 | else | ||
| 56 | # alleged bug in 3.81beta4. Stripping dir from dir/files.c | ||
| 57 | # /top/obj/dir/*.o: /top/obj/dir/file.o: /top/src/file.c | ||
| 58 | $(patsubst %,$(objdir)/%,$(BLKID_OBJS)): $(objdir)/blkid/%.o: $(srcdir)/%.c |$(objdir)/blkid | ||
| 49 | $(patsubst %,$(objdir)/%,$(E2FSCK_OBJS)):$(objdir)/e2fsck/%.o:$(srcdir)/%.c|$(objdir)/e2fsck | 59 | $(patsubst %,$(objdir)/%,$(E2FSCK_OBJS)):$(objdir)/e2fsck/%.o:$(srcdir)/%.c|$(objdir)/e2fsck |
| 50 | $(patsubst %,$(objdir)/%,$(E2P_OBJS)): $(objdir)/e2p/%.o: $(srcdir)/%.c|$(objdir)/e2p | 60 | $(patsubst %,$(objdir)/%,$(E2P_OBJS)): $(objdir)/e2p/%.o: $(srcdir)/%.c |$(objdir)/e2p |
| 51 | $(patsubst %,$(objdir)/%,$(EXT2FS_OBJS)):$(objdir)/ext2fs/%.o:$(srcdir)/%.c|$(objdir)/ext2fs | 61 | $(patsubst %,$(objdir)/%,$(EXT2FS_OBJS)):$(objdir)/ext2fs/%.o:$(srcdir)/%.c|$(objdir)/ext2fs |
| 52 | $(patsubst %,$(objdir)/%,$(UUID_OBJS)): $(objdir)/uuid/%.o: $(srcdir)/%.c|$(objdir)/uuid | 62 | $(patsubst %,$(objdir)/%,$(UUID_OBJS)): $(objdir)/uuid/%.o: $(srcdir)/%.c |$(objdir)/uuid |
| 53 | 63 | endif | |
| 54 | 64 | ||
| 55 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) | 65 | E2FSPROGS-$(CONFIG_CHATTR) += chattr.o $(E2P_OBJS) |
| 56 | E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) | 66 | E2FSPROGS-$(CONFIG_E2FSCK) += e2fsck.o util.o $(BLKID_OBJS) $(EXT2FS_OBJS) $(UUID_OBJS) |