- forgot to make busybox_unstripped depend on the applets in IMA mode.
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Fri, 19 May 2006 18:37:34 +0000 (18:37 -0000)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Fri, 19 May 2006 18:37:34 +0000 (18:37 -0000)
Makefile
e2fsprogs/Makefile.in

index 778bf29375d05320918ea63e677fd3b6b924c325..fdf75c26551e86530eee9adce73d008aeb367671 100644 (file)
--- 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) \
index 468888432952fabe42533092a2656c252df7dc01..89470b787f8dcf7d1467a0b655fe027f087905e1 100644 (file)
@@ -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)