summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-05-19 18:37:34 +0000
committerBernhard Reutner-Fischer2006-05-19 18:37:34 +0000
commitd8e87a09d1f90e527e48199f99e0a3537b12b842 (patch)
tree1c1aa66889524e55ca90ef67a760a9d6b6bdbba5
parentc7801c46349704077eae0fc7dc77a274c6402502 (diff)
downloadbusybox-d8e87a09d1f90e527e48199f99e0a3537b12b842.zip
busybox-d8e87a09d1f90e527e48199f99e0a3537b12b842.tar.gz
- forgot to make busybox_unstripped depend on the applets in IMA mode.
-rw-r--r--Makefile2
-rw-r--r--e2fsprogs/Makefile.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 778bf29..fdf75c2 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ endif
endif # ifeq ($(strip $(CONFIG_BUILD_LIBBUSYBOX)),y)
-busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(libraries-y)
+busybox_unstripped: .depend $(LIBBUSYBOX_SONAME) $(BUSYBOX_SRC) $(APPLET_SRC) $(libraries-y)
$(do_link) $(PROG_CFLAGS) $(PROG_LDFLAGS) $(CFLAGS_COMBINE) \
-o $@ -Wl,--start-group \
$(APPLETS_DEFINE) $(APPLET_SRC) \
diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in
index 4688884..89470b7 100644
--- a/e2fsprogs/Makefile.in
+++ b/e2fsprogs/Makefile.in
@@ -55,8 +55,8 @@ endif
E2FSPROGS_SRC-y:=$(patsubst %.o,$(E2FSPROGS_SRC)/%.c,$(E2FSPROGS-y))
E2FSPROGS_SRC-a:=$(wildcard $(E2FSPROGS_SRC)/*.c) $(patsubst %,$(E2FSPROGS_SRC)/%,$(BLKID_SRCS) $(E2P_SRCS) $(EXT2FS_SRCS) $(UUID_SRCS))
-APPLET_SRC-y+=$(E2FSPROGS_CFLAGS) $(E2FSPROGS_SRC-y)
-APPLET_SRC-a+=$(E2FSPROGS_CFLAGS) $(E2FSPROGS_SRC-a)
+APPLET_SRC-y+=$(E2FSPROGS_SRC-y)
+APPLET_SRC-a+=$(E2FSPROGS_SRC-a)
# XXX: FIXME: change .c to include their stuff relative to $(E2FSPROGS_SRC)
E2FSPROGS_TMP_KLUDGE:=$(patsubst %,-I$(E2FSPROGS_SRC)/%,blkid e2fsck e2p ext2fs uuid)