svn commit: trunk/busybox

aldot at busybox.net aldot at busybox.net
Thu Mar 2 18:13:07 UTC 2006


Author: aldot
Date: 2006-03-02 10:13:05 -0800 (Thu, 02 Mar 2006)
New Revision: 14431

Log:
- make sure applets.o is rebuilt when the .config changes.
- don't overwrite objects in the archive. Affected applets with name-clash
  mostly vs. libbb:
iplink_main
iproute_main
iptunnel_main
login_main
run_parts_main


Modified:
   trunk/busybox/Makefile
   trunk/busybox/Rules.mak


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-03-02 17:38:15 UTC (rev 14430)
+++ trunk/busybox/Makefile	2006-03-02 18:13:05 UTC (rev 14431)
@@ -271,7 +271,7 @@
 # individual object files
 -include $(top_builddir)/.depend
 
-
+$(top_builddir)/applets/applets.o: $(top_builddir)/.config
 # Everything is set.
 
 all: busybox busybox.links doc ;

Modified: trunk/busybox/Rules.mak
===================================================================
--- trunk/busybox/Rules.mak	2006-03-02 17:38:15 UTC (rev 14430)
+++ trunk/busybox/Rules.mak	2006-03-02 18:13:05 UTC (rev 14431)
@@ -94,7 +94,7 @@
 WARNINGS=-Wall -Wstrict-prototypes -Wshadow
 CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include
 
-ARFLAGS=cru
+ARFLAGS=cruP
 
 
 




More information about the busybox-cvs mailing list