2 files changed, 44 insertions, 18 deletions

diff --git a/modutils/Makefile b/modutils/Makefile
index 7a8d4664e..e8246cee7 100644
--- a/modutils/Makefile
+++ b/modutils/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,23 +17,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-TOPDIR   :=..
-L_TARGET := modutils.a
-
-obj-y           :=
-obj-n           :=
-obj-            :=
-
-
-obj-$(CONFIG_INSMOD)            += insmod.o
-obj-$(CONFIG_LSMOD)             += lsmod.o
-obj-$(CONFIG_MODPROBE)          += modprobe.o
-obj-$(CONFIG_RMMOD)             += rmmod.o
-
-
-# Hand off to toplevel Rules.mak
-include $(TOPDIR)/Rules.mak
+TOPDIR:= ../
+MODUTILS_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/modutils/Makefile.in b/modutils/Makefile.in
new file mode 100644
index 000000000..6ad9582fd
--- /dev/null
+++ b/modutils/Makefile.in
@@ -0,0 +1,35 @@
+# 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
+#
+
+MODUTILS_AR:=modutils.a
+ifndef $(MODUTILS_DIR)
+MODUTILS_DIR:=$(TOPDIR)modutils/
+endif
+
+MODUTILS-y:=
+MODUTILS-$(CONFIG_INSMOD)               += insmod.o
+MODUTILS-$(CONFIG_LSMOD)                += lsmod.o
+MODUTILS-$(CONFIG_MODPROBE)             += modprobe.o
+MODUTILS-$(CONFIG_RMMOD)                += rmmod.o
+
+libraries-y+=$(MODUTILS_DIR)$(MODUTILS_AR)
+
+$(MODUTILS_DIR)$(MODUTILS_AR): $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
+        $(AR) -ro $@ $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y))
+