From 642f01a3f25803d3d2fad2a3314644c0a00f89d3 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 9 Mar 2009 12:10:59 +0100 Subject: [PATCH] blkid: blkid.static make target For compatibility with e2fsprogs tree: commit eb630fd8708ae433e55e384079c08e0f0f040d22 Author: Eric Sandeen Date: Tue Feb 24 23:15:33 2009 -0600 e2fsprogs: blkid.static make target Nice for testing w/o needing to swizzle around system libraries... Signed-off-by: Karel Zak --- configure.ac | 2 +- libs/blkid/bin/Makefile.am | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac7d238c..3fdf1ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ AC_CHECK_FUNCS( AC_FUNC_FSEEKO dnl Static compilation -m4_define([UTIL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk]) +m4_define([UTIL_STATIC_PROGRAMS], [losetup, mount, umount, fdisk, sfdisk, blkid]) AC_ARG_ENABLE([static-programs], [AS_HELP_STRING([--enable-static-programs=LIST], diff --git a/libs/blkid/bin/Makefile.am b/libs/blkid/bin/Makefile.am index 97ba9912..ff992ace 100644 --- a/libs/blkid/bin/Makefile.am +++ b/libs/blkid/bin/Makefile.am @@ -5,3 +5,11 @@ AM_LDFLAGS += $(ul_libblkid_la) sbin_PROGRAMS = blkid findfs dist_man_MANS = blkid.8 findfs.8 + +if HAVE_STATIC_BLKID +sbin_PROGRAMS += blkid.static +blkid_static_SOURCES = $(blkid_SOURCES) +blkid_static_LDFLAGS = "-all-static" # libtool option +blkid_static_LDADD = $(ul_libblkid_la) +blkid_static_CFLAGS = -I$(ul_libblkid_srcdir) +endif -- 2.39.5