From 9c79d48bd6354205b2759bc72c7d85015184fc70 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 11 Jan 2012 17:54:04 +0100 Subject: [PATCH] build-sys: suport static build for new [u]mount Signed-off-by: Karel Zak --- sys-utils/Makefile.am | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index cf910247a1..7038abaf42 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -67,13 +67,32 @@ mount_SOURCES = mount.c \ $(top_srcdir)/lib/strutils.c mount_LDADD = $(ul_libmount_la) -mount_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) +mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir) +mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) umount_SOURCES = umount.c $(top_srcdir)/lib/env.c umount_LDADD = $(ul_libmount_la) -umount_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) +umount_CFLAGS = $(AM_CFLAGS) $(SUID_CFLAGS) -I$(ul_libmount_incdir) +umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) + +if HAVE_STATIC_MOUNT +bin_PROGRAMS += mount.static +mount_static_SOURCES = $(mount_SOURCES) +mount_static_CFLAGS = $(mount_CFLAGS) +mount_static_LDFLAGS = $(mount_LDFLAGS) -all-static +mount_static_LDADD = $(mount_LDADD) +endif + +if HAVE_STATIC_UMOUNT +bin_PROGRAMS += umount.static +umount_static_SOURCES = $(umount_SOURCES) +umount_static_CFLAGS = $(umount_CFLAGS) +umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static +umount_static_LDADD = $(umount_LDADD) endif +endif # BUILD_NEW_MOUNT + if BUILD_SWAPON sbin_PROGRAMS += swapon -- 2.47.3