svn commit: trunk/busybox: e2fsprogs

aldot at busybox.net aldot at busybox.net
Fri May 19 18:37:37 UTC 2006


Author: aldot
Date: 2006-05-19 11:37:34 -0700 (Fri, 19 May 2006)
New Revision: 15140

Log:
- forgot to make busybox_unstripped depend on the applets in IMA mode.


Modified:
   trunk/busybox/Makefile
   trunk/busybox/e2fsprogs/Makefile.in


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-05-19 18:35:03 UTC (rev 15139)
+++ trunk/busybox/Makefile	2006-05-19 18:37:34 UTC (rev 15140)
@@ -296,7 +296,7 @@
 
 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) \

Modified: trunk/busybox/e2fsprogs/Makefile.in
===================================================================
--- trunk/busybox/e2fsprogs/Makefile.in	2006-05-19 18:35:03 UTC (rev 15139)
+++ trunk/busybox/e2fsprogs/Makefile.in	2006-05-19 18:37:34 UTC (rev 15140)
@@ -55,8 +55,8 @@
 
 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)




More information about the busybox-cvs mailing list