From c8e278f54ba7ec0d2f5626eef15057b684d7a2df Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 2 Mar 2006 18:13:05 +0000 Subject: [PATCH] - 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 --- Makefile | 2 +- Rules.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ccd486fba..93b598c1a 100644 --- 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 60812a57e..32ca312b9 100644 --- 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