aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-02 18:13:05 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-02 18:13:05 +0000
commitc03a2dd3ad722845076ebc7953748ba530ab9aa2 (patch)
tree3d056fdc41ca29c17f47049da3f4dc9a26c45e64
parenta5716ddfacd7893f524dcf029c17801bc0648005 (diff)
downloadbusybox-w32-c03a2dd3ad722845076ebc7953748ba530ab9aa2.tar.gz
busybox-w32-c03a2dd3ad722845076ebc7953748ba530ab9aa2.tar.bz2
busybox-w32-c03a2dd3ad722845076ebc7953748ba530ab9aa2.zip
- 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 git-svn-id: svn://busybox.net/trunk/busybox@14431 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--Makefile2
-rw-r--r--Rules.mak2
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)
271# individual object files 271# individual object files
272-include $(top_builddir)/.depend 272-include $(top_builddir)/.depend
273 273
274 274$(top_builddir)/applets/applets.o: $(top_builddir)/.config
275# Everything is set. 275# Everything is set.
276 276
277all: busybox busybox.links doc ; 277all: 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)))
94WARNINGS=-Wall -Wstrict-prototypes -Wshadow 94WARNINGS=-Wall -Wstrict-prototypes -Wshadow
95CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include 95CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include
96 96
97ARFLAGS=cru 97ARFLAGS=cruP
98 98
99 99
100 100