- 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

diff --git a/Makefile b/Makefile
index ccd486fbafc9f7f8f236561fff6cb07c8770cc85..93b598c1a74faf5ae8f036c44f3009da83e5a41e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -271,7 +271,7 @@ ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 # individual object files
 -include $(top_builddir)/.depend
 
-
+$(top_builddir)/applets/applets.o: $(top_builddir)/.config
 # Everything is set.
 
 all: busybox busybox.links doc ;

diff --git a/Rules.mak b/Rules.mak
index 60812a57eb759a8aa36977ee795cd0f46d4a7e0b..32ca312b924ca703fa4b5258253654b5649d83be 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -94,7 +94,7 @@ CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
 WARNINGS=-Wall -Wstrict-prototypes -Wshadow
 CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include
 
-ARFLAGS=cru
+ARFLAGS=cruP