From: Bernhard Reutner-Fischer Date: Thu, 2 Mar 2006 18:13:05 +0000 (-0000) Subject: - make sure applets.o is rebuilt when the .config changes. X-Git-Tag: 1_1_0~124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8e278f54ba7ec0d2f5626eef15057b684d7a2df;p=platform%2Fupstream%2Fbusybox.git - 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 ccd486f..93b598c 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 60812a5..32ca312 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