Major rework of the directory structure and the entire build system.

 -Erik

3 files changed, 66 insertions, 4 deletions

diff --git a/miscutils/Makefile b/miscutils/Makefile
new file mode 100644
index 000000000..4e006ba57
--- /dev/null
+++ b/miscutils/Makefile
@@ -0,0 +1,44 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+TOPDIR   :=..
+L_TARGET := miscutils.a
+
+obj-y           :=
+obj-n           :=
+obj-            :=
+
+
+obj-$(CONFIG_ADJTIMEX)		+= adjtimex.o
+obj-$(CONFIG_DC)		+= dc.o
+obj-$(CONFIG_DUTMP)		+= dutmp.o
+obj-$(CONFIG_MAKEDEVS)		+= makedevs.o
+obj-$(CONFIG_mktemp)		+= mktemp.o
+obj-$(CONFIG_mt)		+= mt.o
+obj-$(CONFIG_readlink)		+= readlink.o
+obj-$(CONFIG_update)		+= update.o
+obj-$(CONFIG_watchdog)		+= watchdog.o
+
+
+# Hand off to toplevel Rules.mak
+include $(TOPDIR)/Rules.mak
+
+clean:
+	rm -f $(L_TARGET) *.o core
+
diff --git a/miscutils/config.in b/miscutils/config.in
new file mode 100644
index 000000000..61b2113bc
--- /dev/null
+++ b/miscutils/config.in
@@ -0,0 +1,20 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+mainmenu_option next_comment
+comment 'Miscellaneous Utilities'
+
+bool 'adjtimex'	    CONFIG_ADJTIMEX
+bool 'dc'	    CONFIG_DC
+bool 'dutmp'	    CONFIG_DUTMP
+bool 'makedevs'	    CONFIG_MAKEDEVS
+bool 'mktemp'	    CONFIG_MKTEMP
+bool 'mt'	    CONFIG_MT
+bool 'readlink'	    CONFIG_READLINK
+bool 'update'	    CONFIG_UPDATE
+bool 'watchdog'	    CONFIG_WATCHDOG
+
+endmenu
+
diff --git a/miscutils/readlink.c b/miscutils/readlink.c
index c46ebd108..da5259038 100644
--- a/miscutils/readlink.c
+++ b/miscutils/readlink.c
@@ -2,9 +2,7 @@
 /*
  * Mini readlink implementation for busybox
  *
- *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ * Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +38,7 @@ int readlink_main(int argc, char **argv)
 	if (!buf)
 		return EXIT_FAILURE;
 	puts(buf);
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
 	free(buf);
 #endif