674b08a6b
Eric Andersen
2004-04-06
Subject
Fix it so usage is _always_ in sync with applets.c. Previously, broken depends allowed these to get out of sync.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Makefile +0 -1Rules.mak +0 -11applets/Makefile.in +1 -1applets/applets.c +11 -0applets/usage.c +0 -10
Makefile+0 -1
| @@ -141,7 +141,6 @@ scripts/split-include: scripts/split-include.c | |
| `find . -name \*.c -print` >> .depend; | |
| scripts/mkdep -I include -- \ | |
| `find . -name \*.h -print` >> .hdepend; | |
| - | $(MAKE) $(patsubst %,_sfdep_%,$(DIRS)) _FASTDEP_ALL_SUB_DIRS="$(DIRS)" ; |
| depend dep: include/config.h .depend | |
Rules.mak+0 -11
| @@ -192,17 +192,6 @@ CFLAGS += $(CFLAGS_EXTRA) | |
| %.o: %.c | |
| $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | |
| - | ifdef _FASTDEP_ALL_SUB_DIRS |
| - | fastdep: dummy |
| - | $(TOPDIR)scripts/mkdep $(CFLAGS) $(EXTRA_CFLAGS_nostdinc) -- $(wildcard *.[chS]) > .depend |
| - | ifdef ALL_SUB_DIRS |
| - | $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" |
| - | endif |
| - | |
| - | $(patsubst %,_sfdep_%,$(_FASTDEP_ALL_SUB_DIRS)): |
| - | $(MAKE) -C $(patsubst _sfdep_%,%,$@) fastdep |
| - | endif |
| - | |
| .PHONY: dummy | |
applets/Makefile.in+1 -1
| @@ -22,7 +22,7 @@ ifndef $(APPLETS_DIR) | |
| APPLETS_DIR:=$(TOPDIR)applets/ | |
| endif | |
| - | APPLET_SRC:=applets.c busybox.c usage.c |
| + | APPLET_SRC:=applets.c busybox.c |
| APPLET_OBJ:= $(patsubst %.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) | |
applets/applets.c+11 -0
| @@ -32,11 +32,22 @@ | |
| #include <assert.h> | |
| #include "busybox.h" | |
| + | const char usage_messages[] = |
| + | |
| + | #define MAKE_USAGE |
| + | #include "usage.h" |
| + | |
| + | #include "applets.h" |
| + | |
| + | ; |
| + | |
| + | #undef MAKE_USAGE |
| #undef APPLET | |
| #undef APPLET_NOUSAGE | |
| #undef PROTOTYPES | |
| #include "applets.h" | |
| + | |
| static struct BB_applet *applet_using; | |
| /* The -1 arises because of the {0,NULL,0,-1} entry above. */ | |
applets/usage.c+0 -10
| @@ -1,10 +0,0 @@ | |
| - | #include "busybox.h" |
| - | |
| - | const char usage_messages[] = |
| - | |
| - | #define MAKE_USAGE |
| - | #include "usage.h" |
| - | |
| - | #include "applets.h" |
| - | |
| - | ; |