summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-03-02 18:13:05 +0000
committerBernhard Reutner-Fischer2006-03-02 18:13:05 +0000
commitc8e278f54ba7ec0d2f5626eef15057b684d7a2df (patch)
tree3d056fdc41ca29c17f47049da3f4dc9a26c45e64
parent9b6b8944224a1e79165204e2db812510f1441e15 (diff)
downloadbusybox-c8e278f54ba7ec0d2f5626eef15057b684d7a2df.zip
busybox-c8e278f54ba7ec0d2f5626eef15057b684d7a2df.tar.gz
- 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
-rw-r--r--Makefile2
-rw-r--r--Rules.mak2
2 files changed, 2 insertions, 2 deletions
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