build-sys: drop libcommon_shells from binaries that only need ul_default_shell

Now that ul_default_shell() lives in libcommon, binaries that only
call this function no longer need to link against libcommon_shells
(and transitively libeconf).

Remove libcommon_shells linkage from: flock, unshare, nsenter,
script, scriptlive, more.

Keep libcommon_shells for: login, chsh, su, runuser — these use
is_known_shell(), print_shells() or open_etc_shells() which depend
on libeconf.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 258dc908daf06e9316ee41d11a1213a1b32a5ad5..f98c811049ae9b3a299a3a297d8ef1b68f049a20 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -20,7 +20,7 @@ usrbin_exec_PROGRAMS += flock
 MANPAGES += sys-utils/flock.1
 dist_noinst_DATA += sys-utils/flock.1.adoc
 flock_SOURCES = sys-utils/flock.c lib/monotonic.c lib/timer.c
-flock_LDADD = $(LDADD) libcommon.la libcommon_shells.la $(REALTIME_LIBS)
+flock_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 endif
 
 if BUILD_CHOOM
@@ -523,7 +523,7 @@ dist_noinst_DATA += sys-utils/unshare.1.adoc
 unshare_SOURCES = sys-utils/unshare.c \
                  lib/caputils.c \
                  lib/exec_shell.c
-unshare_LDADD = $(LDADD) libcommon.la libcommon_shells.la
+unshare_LDADD = $(LDADD) libcommon.la
 unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
 
 if HAVE_STATIC_UNSHARE
@@ -541,7 +541,7 @@ MANPAGES += sys-utils/nsenter.1
 dist_noinst_DATA += sys-utils/nsenter.1.adoc
 nsenter_SOURCES = sys-utils/nsenter.c lib/exec_shell.c \
                  lib/caputils.c
-nsenter_LDADD = $(LDADD) libcommon.la libcommon_shells.la $(SELINUX_LIBS)
+nsenter_LDADD = $(LDADD) libcommon.la $(SELINUX_LIBS)
 
 if HAVE_STATIC_NSENTER
 usrbin_exec_PROGRAMS += nsenter.static

diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index f99e4195b77660dd22be626a2c696125e0718cf2..c92a339b67336f1a65a5682a1f419de6feb38a84 100644 (file)
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -7,7 +7,7 @@ script_SOURCES = term-utils/script.c \
                 include/pty-session.h \
                 lib/monotonic.c
 script_CFLAGS = $(AM_CFLAGS) -Wno-format-y2k
-script_LDADD = $(LDADD) libcommon.la libcommon_shells.la $(ISNAN_LIBS) $(REALTIME_LIBS) -lutil
+script_LDADD = $(LDADD) libcommon.la $(ISNAN_LIBS) $(REALTIME_LIBS) -lutil
 if HAVE_UTEMPTER
 script_LDADD += -lutempter
 endif
@@ -38,7 +38,7 @@ scriptlive_SOURCES = term-utils/scriptlive.c \
                       lib/pty-session.c \
                       include/pty-session.h \
                       lib/monotonic.c
-scriptlive_LDADD = $(LDADD) libcommon.la libcommon_shells.la $(ISNAN_LIBS) $(REALTIME_LIBS) -lutil
+scriptlive_LDADD = $(LDADD) libcommon.la $(ISNAN_LIBS) $(REALTIME_LIBS) -lutil
 endif # BUILD_SCRIPTLIVE
 
 

diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index ddae7b1e1a71b0813909d1d58bd1dae04aea1fb8..c4c3e5e230a36f2b3db61ac0af4ab90a4b1b8f5b 100644 (file)
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -98,7 +98,7 @@ MANPAGES += text-utils/more.1
 dist_noinst_DATA += text-utils/more.1.adoc
 more_SOURCES = text-utils/more.c
 more_CFLAGS = $(AM_CFLAGS) $(BSD_WARN_CFLAGS)
-more_LDADD = $(LDADD) $(MAGIC_LIBS) libcommon.la libcommon_shells.la
+more_LDADD = $(LDADD) $(MAGIC_LIBS) libcommon.la
 if HAVE_TINFO
 more_LDADD += $(TINFO_LIBS)
 more_LDADD += $(TINFO_CFLAGS)