nfsmount: style fix

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

diff --git a/util-linux/Makefile.in b/util-linux/Makefile.in
index 9aaaf9f8fd04bed1ac6e46fecdd74609b256b303..d12f9f24f28edc0a8c1b7d764ccc640b3de4186c 100644 (file)
--- a/util-linux/Makefile.in
+++ b/util-linux/Makefile.in
@@ -1,21 +1,8 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2004 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
-# 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
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
+# Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 UTILLINUX_AR:=util-linux.a
 ifndef $(UTILLINUX_DIR)
@@ -23,44 +10,54 @@ UTILLINUX_DIR:=$(top_builddir)/util-linux/
 endif
 srcdir=$(top_srcdir)/util-linux
 
-UTILLINUX-:=
-UTILLINUX-$(CONFIG_DMESG)              +=dmesg.o
-UTILLINUX-$(CONFIG_FBSET)              +=fbset.o
-UTILLINUX-$(CONFIG_FDFLUSH)            +=fdflush.o
-UTILLINUX-$(CONFIG_FDFORMAT)           +=fdformat.o
-UTILLINUX-$(CONFIG_FDISK)              +=fdisk.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_HWCLOCK)            +=hwclock.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
-UTILLINUX-$(CONFIG_READPROFILE)                +=readprofile.o
-
+UTILLINUX-y:=
+UTILLINUX-$(CONFIG_DMESG)         +=dmesg.o
+UTILLINUX-$(CONFIG_FBSET)         +=fbset.o
+UTILLINUX-$(CONFIG_FDFLUSH)       +=freeramdisk.o
+UTILLINUX-$(CONFIG_FDFORMAT)      +=fdformat.o
+UTILLINUX-$(CONFIG_FDISK)         +=fdisk.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_HWCLOCK)       +=hwclock.o
+UTILLINUX-$(CONFIG_IPCRM)         +=ipcrm.o
+UTILLINUX-$(CONFIG_IPCS)          +=ipcs.o
+UTILLINUX-$(CONFIG_LOSETUP)       +=losetup.o
+UTILLINUX-$(CONFIG_MDEV)          +=mdev.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_FEATURE_MOUNT_NFS)  +=nfsmount.o
+UTILLINUX-$(CONFIG_PIVOT_ROOT)    +=pivot_root.o
+UTILLINUX-$(CONFIG_RDATE)         +=rdate.o
+UTILLINUX-$(CONFIG_READPROFILE)   +=readprofile.o
+UTILLINUX-$(CONFIG_SETARCH)       +=setarch.o
+UTILLINUX-$(CONFIG_SWAPONOFF)     +=swaponoff.o
+UTILLINUX-$(CONFIG_SWITCH_ROOT)   +=switch_root.o
+UTILLINUX-$(CONFIG_UMOUNT)        +=umount.o
+
+UTILLINUX-y:=$(sort $(UTILLINUX-y))
+
+ifneq ($(strip $(UTILLINUX-y)),)
 libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR)
+endif
+
+UTILLINUX_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(UTILLINUX-y))
+UTILLINUX_SRC-a:=$(wildcard $(srcdir)/*.c)
+APPLET_SRC-y+=$(UTILLINUX_SRC-y)
+APPLET_SRC-a+=$(UTILLINUX_SRC-a)
 
 $(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
-       $(AR) -ro $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
+       $(do_ar)
 
 $(UTILLINUX_DIR)%.o: $(srcdir)/%.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+       $(compile.c)
 
 ifneq ($(strip $(CONFIG_LFS)),y)
 ifeq ($(strip $(FDISK_SUPPORT_LARGE_DISKS)),y)
-
 $(UTILLINUX_DIR)fdisk.o: $(srcdir)/fdisk.c
-       $(CC) $(CFLAGS) \
-               -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
-               $(EXTRA_CFLAGS) -c -o $@ $<
-
+       $(compile.c) -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 endif