diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-04-06 14:28:35 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-04-06 14:28:35 +0000 |
| commit | 674b08a6b8ce0b3b1c26d9f326fb2e59bd8dc1e8 (patch) | |
| tree | 033bb02dd76c0128a2fe839126ed692515d133ab | |
| parent | 7e496a71cfe54f192508427f9c8ea5be764952bd (diff) | |
| download | busybox-674b08a6b8ce0b3b1c26d9f326fb2e59bd8dc1e8.tar.gz | |
Fix it so usage is _always_ in sync with applets.c. Previously,
broken depends allowed these to get out of sync.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Rules.mak | 11 | ||||
| -rw-r--r-- | applets/Makefile.in | 2 | ||||
| -rw-r--r-- | applets/applets.c | 11 | ||||
| -rw-r--r-- | applets/usage.c | 10 |
5 files changed, 12 insertions, 23 deletions
@@ -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 @@ -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 diff --git a/applets/Makefile.in b/applets/Makefile.in index 79582e069..afd5cbeb9 100644 --- a/applets/Makefile.in +++ b/applets/Makefile.in @@ -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)) diff --git a/applets/applets.c b/applets/applets.c index 7d8adfb65..d370e6a00 100644 --- a/applets/applets.c +++ b/applets/applets.c @@ -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. */ diff --git a/applets/usage.c b/applets/usage.c deleted file mode 100644 index dfea1f96b..000000000 --- a/applets/usage.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "busybox.h" - -const char usage_messages[] = - -#define MAKE_USAGE -#include "usage.h" - -#include "applets.h" - -; |