[BusyBox-cvs] busybox/applets Makefile.in, 1.4, 1.5 applets.c, 1.24, 1.25 usage.c, 1.59, NONE

[Erik Andersen]

Update of /var/cvs/busybox/applets
In directory nail:/tmp/cvs-serv18358/applets

Modified Files:
	Makefile.in applets.c 
Removed Files:
	usage.c 
Log Message:
Fix it so usage is _always_ in sync with applets.c.  Previously,
broken depends allowed these to get out of sync.


Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/applets/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/Makefile.in	15 Mar 2004 08:28:15 -0000	1.4
+++ b/Makefile.in	6 Apr 2004 14:28:35 -0000	1.5
@@ -22,7 +22,7 @@
 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))
 
 

Index: applets.c
===================================================================
RCS file: /var/cvs/busybox/applets/applets.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- a/applets.c	15 Mar 2004 08:28:15 -0000	1.24
+++ b/applets.c	6 Apr 2004 14:28:35 -0000	1.25
@@ -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. */

--- usage.c DELETED ---