Link against libcommon_logindefs.la and libcommon_shells.la

Instead of linking with logindefs.c and shells.c library files, link
against libcommon_logindefs.la and libcommon_shells.la and handle possibly
needed econf libs there.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 29bb49025018e62b9278a4ea3b6f471ad090c887..cfaddf8e8d517b980ac4a2d3f8afe701c17d7e7b 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -68,6 +68,14 @@ libcommon_la_SOURCES += lib/procfs.c
 endif
 endif
 
+EXTRA_LTLIBRARIES += libcommon_logindefs.la
+libcommon_logindefs_la_CFLAGS = $(AM_CFLAGS)
+libcommon_logindefs_la_SOURCES = \
+       lib/logindefs.c
+if HAVE_ECONF
+libcommon_logindefs_la_LIBADD = $(ECONF_LIBS)
+endif
+
 EXTRA_LTLIBRARIES += libcommon_shells.la
 libcommon_shells_la_CFLAGS = $(AM_CFLAGS)
 libcommon_shells_la_SOURCES = \

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index bc37fc61714d7c083e9a988a706cf1b552fb8b53..a82e4b70f201dc84b29510edb6bf697b929fb0d2 100644 (file)
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -58,9 +58,8 @@ bin_PROGRAMS += login
 MANPAGES += login-utils/login.1
 dist_noinst_DATA += login-utils/login.1.adoc
 login_SOURCES = \
-       login-utils/login.c \
-       lib/logindefs.c
-login_LDADD = $(LDADD) libcommon.la libcommon_shells.la -lpam
+       login-utils/login.c
+login_LDADD = $(LDADD) libcommon.la libcommon_logindefs.la libcommon_shells.la -lpam
 if HAVE_LINUXPAM
 login_LDADD += -lpam_misc
 endif
@@ -140,22 +139,16 @@ endif
 
 chfn_SOURCES = \
        login-utils/chfn.c \
-       lib/logindefs.c \
        $(chfn_chsh_sources)
 chfn_CFLAGS = $(chfn_chsh_cflags)
 chfn_LDFLAGS = $(chfn_chsh_ldflags)
-chfn_LDADD = $(LDADD) $(chfn_chsh_ldadd)
-if HAVE_ECONF
-chfn_LDADD += $(ECONF_LIBS)
-endif
+chfn_LDADD = $(LDADD) $(chfn_chsh_ldadd) libcommon_logindefs.la
 
-chsh_SOURCES = login-utils/chsh.c lib/shells.c $(chfn_chsh_sources)
+chsh_SOURCES = login-utils/chsh.c \
+       $(chfn_chsh_sources)
 chsh_CFLAGS = $(chfn_chsh_cflags)
 chsh_LDFLAGS = $(chfn_chsh_ldflags)
-chsh_LDADD = $(LDADD) $(chfn_chsh_ldadd)
-if HAVE_ECONF
-chsh_LDADD += $(ECONF_LIBS)
-endif
+chsh_LDADD = $(LDADD) $(chfn_chsh_ldadd) libcommon_logindefs.la libcommon_shells.la
 endif # BUILD_CHFN_CHSH
 
 
@@ -166,12 +159,10 @@ dist_noinst_DATA += login-utils/su.1.adoc
 su_SOURCES = \
        login-utils/su.c \
        login-utils/su-common.c \
-       login-utils/su-common.h \
-       lib/logindefs.c \
-       lib/shells.c
+       login-utils/su-common.h
 su_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-su_LDADD = $(LDADD) libcommon.la -lpam
+su_LDADD = $(LDADD) libcommon.la libcommon_logindefs.la libcommon_shells.la -lpam
 if HAVE_LINUXPAM
 su_LDADD += -lpam_misc
 endif
@@ -181,9 +172,6 @@ su_SOURCES += lib/pty-session.c \
       lib/monotonic.c
 su_LDADD += -lutil $(REALTIME_LIBS)
 endif
-if HAVE_ECONF
-su_LDADD += $(ECONF_LIBS)
-endif
 endif # BUILD_SU
 
 
@@ -194,10 +182,8 @@ dist_noinst_DATA += login-utils/runuser.1.adoc
 runuser_SOURCES = \
        login-utils/runuser.c \
        login-utils/su-common.c \
-       login-utils/su-common.h \
-       lib/logindefs.c \
-       lib/shells.c
-runuser_LDADD = $(LDADD) libcommon.la -lpam
+       login-utils/su-common.h
+runuser_LDADD = $(LDADD) libcommon.la libcommon_logindefs.la libcommon_shells.la -lpam
 if HAVE_LINUXPAM
 runuser_LDADD += -lpam_misc
 endif
@@ -207,9 +193,6 @@ runuser_SOURCES += lib/pty-session.c \
        lib/monotonic.c
 runuser_LDADD += -lutil $(REALTIME_LIBS)
 endif
-if HAVE_ECONF
-runuser_LDADD += $(ECONF_LIBS)
-endif
 endif # BUILD_RUNUSER
 
 
@@ -232,9 +215,8 @@ usrbin_exec_PROGRAMS += lslogins
 MANPAGES += login-utils/lslogins.1
 dist_noinst_DATA += login-utils/lslogins.1.adoc
 lslogins_SOURCES = \
-       login-utils/lslogins.c \
-       lib/logindefs.c
-lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la
+       login-utils/lslogins.c
+lslogins_LDADD = $(LDADD) libcommon.la libcommon_logindefs.la libsmartcols.la
 lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 if HAVE_SELINUX
 lslogins_LDADD += $(SELINUX_LIBS)
@@ -243,9 +225,6 @@ if HAVE_SYSTEMD
 lslogins_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS)
 lslogins_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS)
 endif
-if HAVE_ECONF
-lslogins_LDADD += $(ECONF_LIBS)
-endif
 if BUILD_LIBLASTLOG2
 lslogins_CFLAGS += -I$(ul_liblastlog2_incdir)
 lslogins_LDADD += liblastlog2.la

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 6966f30e038c797fb7fe2e6c81a4e4b92a99dac3..258dc908daf06e9316ee41d11a1213a1b32a5ad5 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -593,14 +593,10 @@ usrbin_exec_PROGRAMS += setpriv
 MANPAGES += sys-utils/setpriv.1
 dist_noinst_DATA += sys-utils/setpriv.1.adoc
 setpriv_SOURCES = sys-utils/setpriv.c \
-                 lib/caputils.c \
-                 lib/logindefs.c
+                 lib/caputils.c
 dist_noinst_HEADERS += sys-utils/setpriv-landlock.h
 if HAVE_LINUX_LANDLOCK_H
 setpriv_SOURCES += sys-utils/setpriv-landlock.c
 endif
-setpriv_LDADD = $(LDADD) $(CAP_NG_LIBS) libcommon.la
-if HAVE_ECONF
-setpriv_LDADD += $(ECONF_LIBS)
-endif
+setpriv_LDADD = $(LDADD) $(CAP_NG_LIBS) libcommon.la libcommon_logindefs.la
 endif # BUILD_SETPRIV

diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index 0e77f0ec7a81178e22f3ead9c4a2c702174d1870..f99e4195b77660dd22be626a2c696125e0718cf2 100644 (file)
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -46,21 +46,17 @@ if BUILD_AGETTY
 sbin_PROGRAMS += agetty
 MANPAGES += term-utils/agetty.8
 dist_noinst_DATA += term-utils/agetty.8.adoc
-agetty_SOURCES = term-utils/agetty.c \
-                lib/logindefs.c
+agetty_SOURCES = term-utils/agetty.c
 if USE_PLYMOUTH_SUPPORT
 agetty_SOURCES += lib/plymouth-ctrl.c
 endif
 if LINUX
 agetty_SOURCES += lib/netlink.c lib/netaddrq.c
 endif
-agetty_LDADD = $(LDADD) libcommon.la
+agetty_LDADD = $(LDADD) libcommon.la libcommon_logindefs.la
 if BSD
 agetty_LDADD += -lutil
 endif
-if HAVE_ECONF
-agetty_LDADD += $(ECONF_LIBS)
-endif
 if HAVE_SYSTEMD
 agetty_LDADD += $(SYSTEMD_LIBS)
 agetty_CFLAGS = $(SYSTEMD_CFLAGS)