aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /util-linux
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
- revert back to r14406
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/Makefile.in91
1 files changed, 51 insertions, 40 deletions
diff --git a/util-linux/Makefile.in b/util-linux/Makefile.in
index b56a7766e..f6a50b7f7 100644
--- a/util-linux/Makefile.in
+++ b/util-linux/Makefile.in
@@ -4,51 +4,62 @@
#
# Licensed under the GPL v2, see the file LICENSE in this tarball.
-srcdir:=$(top_srcdir)/util-linux
-objdir:=$(top_builddir)/util-linux
-
-UTIL-LINUX-$(CONFIG_DMESG) +=dmesg.o
-UTIL-LINUX-$(CONFIG_FBSET) +=fbset.o
-UTIL-LINUX-$(CONFIG_FDFLUSH) +=fdflush.o
-UTIL-LINUX-$(CONFIG_FDFORMAT) +=fdformat.o
-UTIL-LINUX-$(CONFIG_FDISK) +=fdisk.o
-UTIL-LINUX-$(CONFIG_FREERAMDISK) +=freeramdisk.o
-UTIL-LINUX-$(CONFIG_FSCK_MINIX) +=fsck_minix.o
-UTIL-LINUX-$(CONFIG_GETOPT) +=getopt.o
-UTIL-LINUX-$(CONFIG_HEXDUMP) +=hexdump.o
-UTIL-LINUX-$(CONFIG_HWCLOCK) +=hwclock.o
-UTIL-LINUX-$(CONFIG_IPCRM) +=ipcrm.o
-UTIL-LINUX-$(CONFIG_IPCS) +=ipcs.o
-UTIL-LINUX-$(CONFIG_LOSETUP) +=losetup.o
-UTIL-LINUX-$(CONFIG_MDEV) +=mdev.o
-UTIL-LINUX-$(CONFIG_MKFS_MINIX) +=mkfs_minix.o
-UTIL-LINUX-$(CONFIG_MKSWAP) +=mkswap.o
-UTIL-LINUX-$(CONFIG_MORE) +=more.o
-UTIL-LINUX-$(CONFIG_MOUNT) +=mount.o
-UTIL-LINUX-$(CONFIG_FEATURE_MOUNT_NFS) +=nfsmount.o
-UTIL-LINUX-$(CONFIG_PIVOT_ROOT) +=pivot_root.o
-UTIL-LINUX-$(CONFIG_RDATE) +=rdate.o
-UTIL-LINUX-$(CONFIG_READPROFILE) +=readprofile.o
-UTIL-LINUX-$(CONFIG_SETARCH) +=setarch.o
-UTIL-LINUX-$(CONFIG_SWAPONOFF) +=swaponoff.o
-UTIL-LINUX-$(CONFIG_SWITCH_ROOT) +=switch_root.o
-UTIL-LINUX-$(CONFIG_UMOUNT) +=umount.o
-
-
-UTILLINUX_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(UTIL-LINUX-y))
+UTILLINUX_AR:=util-linux.a
+ifndef $(UTILLINUX_DIR)
+UTILLINUX_DIR:=$(top_builddir)/util-linux/
+endif
+srcdir=$(top_srcdir)/util-linux
+
+UTILLINUX-y:=
+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_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
+
+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))
+ $(do_ar)
+
+$(UTILLINUX_DIR)%.o: $(srcdir)/%.c
+ $(compile.c)
+
ifneq ($(strip $(CONFIG_LFS)),y)
ifeq ($(strip $(FDISK_SUPPORT_LARGE_DISKS)),y)
-CFLAGS-util-linux-fdisk.c := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-endif
-endif
-util-linux_OBJ:= $(patsubst %,$(objdir)/%,$(UTIL-LINUX-y))
-
-$(util-linux_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/util-linux.a: $(util-linux_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/util-linux.a
+$(UTILLINUX_DIR)fdisk.o: $(srcdir)/fdisk.c
+ $(CC) $(CFLAGS) \
+ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ $(EXTRA_CFLAGS) -c -o $@ $<
+endif
+endif