2 files changed, 51 insertions, 25 deletions

diff --git a/miscutils/Makefile b/miscutils/Makefile
index 3a4d1b659..b1765f627 100644
--- a/miscutils/Makefile
+++ b/miscutils/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2002 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
@@ -17,30 +17,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-TOPDIR   :=..
-L_TARGET := miscutils.a
-EXTRA_CFLAGS = -DBB_VER='"$(VERSION)"' -DBB_BT='"$(BUILDTIME)"'
-
-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_TIME)              += time.o
-obj-$(CONFIG_UPDATE)            += update.o
-obj-$(CONFIG_WATCHDOG)          += watchdog.o
-
-
-# Hand off to toplevel Rules.mak
-include $(TOPDIR)/Rules.mak
+TOPDIR:= ../
+MISCUTILS_DIR:=./
+include $(TOPDIR).config
+include $(TOPDIR)Rules.mak
+include Makefile.in
+all: $(libraries-y)
+-include $(TOPDIR).depend
 
 clean:
-        rm -f $(L_TARGET) *.o core
+        rm -f *.o *.a $(AR_TARGET)
 
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
new file mode 100644
index 000000000..078f87001
--- /dev/null
+++ b/miscutils/Makefile.in
@@ -0,0 +1,42 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2002 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
+#
+
+MISCUTILS_AR:=miscutils.a
+ifndef $(MISCUTILS_DIR)
+MISCUTILS_DIR:=$(TOPDIR)miscutils/
+endif
+
+
+MISCUTILS-y:=
+MISCUTILS-$(CONFIG_ADJTIMEX)            += adjtimex.o
+MISCUTILS-$(CONFIG_DC)                  += dc.o
+MISCUTILS-$(CONFIG_DUTMP)               += dutmp.o
+MISCUTILS-$(CONFIG_MAKEDEVS)            += makedevs.o
+MISCUTILS-$(CONFIG_MKTEMP)              += mktemp.o
+MISCUTILS-$(CONFIG_MT)                  += mt.o
+MISCUTILS-$(CONFIG_READLINK)            += readlink.o
+MISCUTILS-$(CONFIG_TIME)                += time.o
+MISCUTILS-$(CONFIG_UPDATE)              += update.o
+MISCUTILS-$(CONFIG_WATCHDOG)            += watchdog.o
+
+libraries-y+=$(MISCUTILS_DIR)$(MISCUTILS_AR)
+
+$(MISCUTILS_DIR)$(MISCUTILS_AR): $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
+        $(AR) -ro $@ $(patsubst %,$(MISCUTILS_DIR)%, $(MISCUTILS-y))
+