emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix it so usage is _always_ in sync with applets.c. Previously,

Browse Source 
broken depends allowed these to get out of sync.
This commit is contained in:
Eric Andersen 2004-04-06 14:28:35 +00:00
parent 7e496a71cf
commit 674b08a6b8
5 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -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

11
Rules.mak
View File

@ -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

2
applets/Makefile.in
View File

@ -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))

11
applets/applets.c
View File

@ -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. */

10
applets/usage.c
View File

@ -1,10 +0,0 @@
#include "busybox.h"
const char usage_messages[] =
#define MAKE_USAGE
#include "usage.h"
#include "applets.h"
;