From 495a87331a5c1803b905543b4beeb0b8cc71d373 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 5 Nov 2009 22:49:11 +0100 Subject: [PATCH] build-sys: remove LT_STATIC_LDFLAGS It was really stupid idea to use *_LDFLAGS for some global variable. Signed-off-by: Karel Zak --- config/include-Makefile.am | 3 --- fdisk/Makefile.am | 4 ++-- misc-utils/Makefile.am | 2 +- mount/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/config/include-Makefile.am b/config/include-Makefile.am index ae641421..f0077695 100644 --- a/config/include-Makefile.am +++ b/config/include-Makefile.am @@ -3,9 +3,6 @@ AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \ AM_CFLAGS = -fsigned-char AM_LDFLAGS = -# generic libtool options for static programs -LT_STATIC_LDFLAGS = -all-static - # Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals. # Unlike with other dist primaries, the files are not distributed if the # conditional is false. diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index e238afc0..fed3ebfd 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -21,7 +21,7 @@ fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \ if HAVE_STATIC_FDISK sbin_PROGRAMS += fdisk.static fdisk_static_SOURCES = $(fdisk_SOURCES) -fdisk_static_LDFLAGS = $(LT_STATIC_LDFLAGS) +fdisk_static_LDFLAGS = -all-static endif if !ARCH_SPARC @@ -33,7 +33,7 @@ sfdisk_SOURCES = sfdisk.c partname.c $(fdisk_common) if HAVE_STATIC_SFDISK sbin_PROGRAMS += sfdisk.static sfdisk_static_SOURCES = $(sfdisk_SOURCES) -sfdisk_static_LDFLAGS = $(LT_STATIC_LDFLAGS) +sfdisk_static_LDFLAGS = -all-static endif if USE_SLANG diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 4acf88cb..3ce85c64 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -45,7 +45,7 @@ wipefs_CFLAGS = -I$(ul_libblkid_srcdir) if HAVE_STATIC_BLKID sbin_PROGRAMS += blkid.static blkid_static_SOURCES = $(blkid_SOURCES) -blkid_static_LDFLAGS = $(LT_STATIC_LDFALGS) +blkid_static_LDFLAGS = -all-static blkid_static_LDADD = $(ul_libblkid_la) blkid_static_CFLAGS = -I$(ul_libblkid_srcdir) endif diff --git a/mount/Makefile.am b/mount/Makefile.am index dea572ad..60ea59e0 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -24,7 +24,7 @@ srcs_mount = fstab.c mount_mntent.c getusername.c lomount.c devname.c devname.h ldadd_common = ldadd_static = cflags_common = -ldflags_static = $(LT_STATIC_LDFLAGS) +ldflags_static = -all-static mount_SOURCES = mount.c $(srcs_mount) ../lib/setproctitle.c mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common) -- 2.39.5