diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-02 18:13:05 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-02 18:13:05 +0000 |
commit | c8e278f54ba7ec0d2f5626eef15057b684d7a2df (patch) | |
tree | 3d056fdc41ca29c17f47049da3f4dc9a26c45e64 | |
parent | 9b6b8944224a1e79165204e2db812510f1441e15 (diff) | |
download | busybox-w32-c8e278f54ba7ec0d2f5626eef15057b684d7a2df.tar.gz busybox-w32-c8e278f54ba7ec0d2f5626eef15057b684d7a2df.tar.bz2 busybox-w32-c8e278f54ba7ec0d2f5626eef15057b684d7a2df.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
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | Rules.mak | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 | ||
277 | all: busybox busybox.links doc ; | 277 | all: busybox busybox.links doc ; |
@@ -94,7 +94,7 @@ CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) | |||
94 | WARNINGS=-Wall -Wstrict-prototypes -Wshadow | 94 | WARNINGS=-Wall -Wstrict-prototypes -Wshadow |
95 | CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include | 95 | CFLAGS+=-I$(top_builddir)/include -I$(top_srcdir)/include |
96 | 96 | ||
97 | ARFLAGS=cru | 97 | ARFLAGS=cruP |
98 | 98 | ||
99 | 99 | ||
100 | 100 | ||