2 files changed, 57 insertions, 29 deletions

diff --git a/util-linux/Makefile b/util-linux/Makefile
index 9cd1486b6..41080a930 100644
--- a/util-linux/Makefile
+++ b/util-linux/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,34 +17,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-TOPDIR   :=..
-L_TARGET := util-linux.a
-
-obj-y           :=
-obj-n           :=
-obj-            :=
-
-obj-$(CONFIG_DMESG)             += dmesg.o
-obj-$(CONFIG_FBSET)             += fbset.o
-obj-$(CONFIG_FDFLUSH)           += fdflush.o
-obj-$(CONFIG_FREERAMDISK)       += freeramdisk.o
-obj-$(CONFIG_FSCK_MINIX)        += fsck_minix.o
-obj-$(CONFIG_GETOPT)            += getopt.o
-obj-$(CONFIG_HEXDUMP)           += hexdump.o
-obj-$(CONFIG_LOSETUP)           += losetup.o
-obj-$(CONFIG_MKFS_MINIX)        += mkfs_minix.o
-obj-$(CONFIG_MKSWAP)            += mkswap.o
-obj-$(CONFIG_MORE)              += more.o
-obj-$(CONFIG_MOUNT)             += mount.o
-obj-$(CONFIG_NFSMOUNT)          += nfsmount.o
-obj-$(CONFIG_PIVOT_ROOT)        += pivot_root.o
-obj-$(CONFIG_RDATE)             += rdate.o
-obj-$(CONFIG_SWAPONOFF)         += swaponoff.o
-obj-$(CONFIG_UMOUNT)            += umount.o
-
-# Hand off to toplevel Rules.mak
-include $(TOPDIR)/Rules.mak
+TOPDIR:= ../
+UTILLINUX_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/util-linux/Makefile.in b/util-linux/Makefile.in
new file mode 100644
index 000000000..fbe075ded
--- /dev/null
+++ b/util-linux/Makefile.in
@@ -0,0 +1,48 @@
+# 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
+#
+
+UTILLINUX_AR:=util-linux.a
+ifndef $(UTILLINUX_DIR)
+UTILLINUX_DIR:=$(TOPDIR)util-linux/
+endif
+
+UTILLINUX-:=
+UTILLINUX-$(CONFIG_DMESG)               += dmesg.o
+UTILLINUX-$(CONFIG_FBSET)               += fbset.o
+UTILLINUX-$(CONFIG_FDFLUSH)             += fdflush.o
+UTILLINUX-$(CONFIG_FREERAMDISK) += freeramdisk.o
+UTILLINUX-$(CONFIG_FSCK_MINIX)  += fsck_minix.o
+UTILLINUX-$(CONFIG_GETOPT)              += getopt.o
+UTILLINUX-$(CONFIG_HEXDUMP)             += hexdump.o
+UTILLINUX-$(CONFIG_LOSETUP)             += losetup.o
+UTILLINUX-$(CONFIG_MKFS_MINIX)  += mkfs_minix.o
+UTILLINUX-$(CONFIG_MKSWAP)              += mkswap.o
+UTILLINUX-$(CONFIG_MORE)                += more.o
+UTILLINUX-$(CONFIG_MOUNT)               += mount.o
+UTILLINUX-$(CONFIG_NFSMOUNT)            += nfsmount.o
+UTILLINUX-$(CONFIG_PIVOT_ROOT)  += pivot_root.o
+UTILLINUX-$(CONFIG_RDATE)               += rdate.o
+UTILLINUX-$(CONFIG_SWAPONOFF)           += swaponoff.o
+UTILLINUX-$(CONFIG_UMOUNT)              += umount.o
+
+libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR)
+
+$(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
+        $(AR) -ro $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
+