diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-19 18:37:34 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-19 18:37:34 +0000 |
| commit | d8e87a09d1f90e527e48199f99e0a3537b12b842 (patch) | |
| tree | 1c1aa66889524e55ca90ef67a760a9d6b6bdbba5 | |
| parent | c7801c46349704077eae0fc7dc77a274c6402502 (diff) | |
| download | busybox-w32-d8e87a09d1f90e527e48199f99e0a3537b12b842.tar.gz busybox-w32-d8e87a09d1f90e527e48199f99e0a3537b12b842.tar.bz2 busybox-w32-d8e87a09d1f90e527e48199f99e0a3537b12b842.zip | |
- forgot to make busybox_unstripped depend on the applets in IMA mode.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | e2fsprogs/Makefile.in | 4 |
2 files changed, 3 insertions, 3 deletions
| @@ -296,7 +296,7 @@ endif | |||
| 296 | 296 | ||
| 297 | endif # ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) | 297 | endif # ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y) |
| 298 | 298 | ||
| 299 | busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(libraries-y) | 299 | busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(APPLET_SRC) $(libraries-y) |
| 300 | $(do_link) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \ | 300 | $(do_link) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \ |
| 301 | -o $@ -Wl,--start-group \ | 301 | -o $@ -Wl,--start-group \ |
| 302 | $(APPLETS_DEFINE) $(APPLET_SRC) \ | 302 | $(APPLETS_DEFINE) $(APPLET_SRC) \ |
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in index 468888432..89470b787 100644 --- a/e2fsprogs/Makefile.in +++ b/e2fsprogs/Makefile.in | |||
| @@ -55,8 +55,8 @@ endif | |||
| 55 | 55 | ||
| 56 | E2FSPROGS_SRC-y:=$(patsubst %.o,$(E2FSPROGS_SRC)/%.c,$(E2FSPROGS-y)) | 56 | E2FSPROGS_SRC-y:=$(patsubst %.o,$(E2FSPROGS_SRC)/%.c,$(E2FSPROGS-y)) |
| 57 | E2FSPROGS_SRC-a:=$(wildcard $(E2FSPROGS_SRC)/*.c) $(patsubst %,$(E2FSPROGS_SRC)/%,$(BLKID_SRCS) $(E2P_SRCS) $(EXT2FS_SRCS) $(UUID_SRCS)) | 57 | E2FSPROGS_SRC-a:=$(wildcard $(E2FSPROGS_SRC)/*.c) $(patsubst %,$(E2FSPROGS_SRC)/%,$(BLKID_SRCS) $(E2P_SRCS) $(EXT2FS_SRCS) $(UUID_SRCS)) |
| 58 | APPLET_SRC-y+=$(E2FSPROGS_CFLAGS) $(E2FSPROGS_SRC-y) | 58 | APPLET_SRC-y+=$(E2FSPROGS_SRC-y) |
| 59 | APPLET_SRC-a+=$(E2FSPROGS_CFLAGS) $(E2FSPROGS_SRC-a) | 59 | APPLET_SRC-a+=$(E2FSPROGS_SRC-a) |
| 60 | 60 | ||
| 61 | # XXX: FIXME: change .c to include their stuff relative to $(E2FSPROGS_SRC) | 61 | # XXX: FIXME: change .c to include their stuff relative to $(E2FSPROGS_SRC) |
| 62 | E2FSPROGS_TMP_KLUDGE:=$(patsubst %,-I$(E2FSPROGS_SRC)/%,blkid e2fsck e2p ext2fs uuid) | 62 | E2FSPROGS_TMP_KLUDGE:=$(patsubst %,-I$(E2FSPROGS_SRC)/%,blkid e2fsck e2p ext2fs uuid) |