diff options
| author | Ondrej Oprala | 2014-04-08 10:51:02 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-05-15 13:55:59 +0200 |
| commit | 914e20a00a7d7236feed9be4444be9deb0b59399 (patch) | |
| tree | 2c6977bef5792fdcb075dba2f3d014ef97720f16 | |
| parent | lslogins(1): skeleton and argparsing for a new utility (diff) | |
| download | kernel-qcow2-util-linux-914e20a00a7d7236feed9be4444be9deb0b59399.tar.gz kernel-qcow2-util-linux-914e20a00a7d7236feed9be4444be9deb0b59399.tar.xz kernel-qcow2-util-linux-914e20a00a7d7236feed9be4444be9deb0b59399.zip | |
lslogins: move to login-utils
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
| -rw-r--r-- | login-utils/Makemodule.am | 13 | ||||
| -rw-r--r-- | login-utils/lslogins.1 (renamed from sys-utils/lslogins.1) | 0 | ||||
| -rw-r--r-- | login-utils/lslogins.c (renamed from sys-utils/lslogins.c) | 0 | ||||
| -rw-r--r-- | sys-utils/Makemodule.am | 10 |
4 files changed, 13 insertions, 10 deletions
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index 49fde4544..0275a6952 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -207,3 +207,16 @@ endif if BUILD_VIPW cd $(DESTDIR)$(usrsbin_execdir) && ln -sf vipw vigr endif + +if BUILD_LSLOGINS +usrbin_exec_PROGRAMS += lslogins +dist_man_MANS += login-utils/lslogins.1 +lslogins_SOURCES = \ + login-utils/lslogins.c \ + login-utils/lslogins.h +lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la +lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) +if HAVE_SELINUX +lslogins_LDADD += -lselinux +endif +endif # BUILD_LSLOGINS diff --git a/sys-utils/lslogins.1 b/login-utils/lslogins.1 index 9b62cb86c..9b62cb86c 100644 --- a/sys-utils/lslogins.1 +++ b/login-utils/lslogins.1 diff --git a/sys-utils/lslogins.c b/login-utils/lslogins.c index c9f812f36..c9f812f36 100644 --- a/sys-utils/lslogins.c +++ b/login-utils/lslogins.c diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 2723768f9..9d69bc60e 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -334,13 +334,3 @@ dist_man_MANS += sys-utils/setpriv.1 setpriv_SOURCES = sys-utils/setpriv.c setpriv_LDADD = $(LDADD) -lcap-ng libcommon.la endif - -if BUILD_LSLOGINS -usrbin_exec_PROGRAMS += lslogins -dist_man_MANS += sys-utils/lslogins.1 -lslogins_SOURCES = \ - sys-utils/lslogins.c \ - sys-utils/lslogins.h -lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la -lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) -endif |