Stephane Billiart noticed that the return code of the new mount was horked.

[oweals/busybox.git] / util-linux / Makefile

diff --git a/util-linux/Makefile b/util-linux/Makefile
index ddecf50d35024983447d7bc8d9a494da4bccc019..efcf6e3bbeb9404a7ba2f1ac009df63907d7cd58 100644 (file)
--- 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-2005 by Erik Andersen <andersen@codepoet.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,32 +17,15 @@
 # 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_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
+top_srcdir=..
+top_builddir=..
+srcdir=$(top_srcdir)/util-linux
+UTILLINUX_DIR:=./
+include $(top_builddir)/Rules.mak
+include $(top_builddir)/.config
+include Makefile.in
+all: $(libraries-y)
+-include $(top_builddir)/.depend
 
 clean:
-       rm -f $(L_TARGET) *.o core
-
+       rm -f *.o *.a $(AR_TARGET)