build-sys: move login-utils/logindefs.c to lib

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

diff --git a/include/Makemodule.am b/include/Makemodule.am
index 3329b4f7c1acc7e4893fe729b6a3d78039a73b34..7e944b2a451005d4d924a6e41ccde82ae1cabc62 100644 (file)
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -32,6 +32,7 @@ dist_noinst_HEADERS += \
        include/pwdutils.h \
        include/linux_version.h \
        include/list.h \
+       include/logindefs.h \
        include/loopdev.h \
        include/mangle.h \
        include/match.h \

diff --git a/login-utils/logindefs.h b/include/logindefs.h
similarity index 100%
rename from login-utils/logindefs.h
rename to include/logindefs.h

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index d38c21e953309c86b693f093722fed4a2022298a..2856f834d213fee356bcb599783a77738c3c66ac 100644 (file)
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -94,7 +94,8 @@ check_PROGRAMS += \
        test_strutils \
        test_ttyutils \
        test_timeutils \
-       test_c_strtod
+       test_c_strtod \
+       test_logindefs
 
 
 if LINUX
@@ -222,3 +223,11 @@ test_loopdev_SOURCES = lib/loopdev.c \
                       $(test_canonicalize_SOURCES)
 test_loopdev_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_LOOPDEV
 endif
+
+
+test_logindefs_SOURCES = lib/logindefs.c
+test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
+test_logindefs_LDADD = $(LDADD) libcommon.la
+if HAVE_ECONF
+test_logindefs_LDADD += -leconf
+endif

diff --git a/login-utils/logindefs.c b/lib/logindefs.c
similarity index 100%
rename from login-utils/logindefs.c
rename to lib/logindefs.c

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 2d0547a16b63447c3318a3a09c16294fcfe8d4de..6d35d4dcdc430ba65f9732e92e7fbf1f696cfa54 100644 (file)
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -59,8 +59,7 @@ MANPAGES += login-utils/login.1
 dist_noinst_DATA += login-utils/login.1.adoc
 login_SOURCES = \
        login-utils/login.c \
-       login-utils/logindefs.c \
-       login-utils/logindefs.h
+       lib/logindefs.c
 login_LDADD = $(LDADD) libcommon.la -lpam
 if HAVE_LINUXPAM
 login_LDADD += -lpam_misc
@@ -144,8 +143,7 @@ endif
 
 chfn_SOURCES = \
        login-utils/chfn.c \
-       login-utils/logindefs.c \
-       login-utils/logindefs.h \
+       lib/logindefs.c \
        $(chfn_chsh_sources)
 chfn_CFLAGS = $(chfn_chsh_cflags)
 chfn_LDFLAGS = $(chfn_chsh_ldflags)
@@ -169,8 +167,7 @@ su_SOURCES = \
        login-utils/su.c \
        login-utils/su-common.c \
        login-utils/su-common.h \
-       login-utils/logindefs.c \
-       login-utils/logindefs.h
+       lib/logindefs.c
 su_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 su_LDADD = $(LDADD) libcommon.la -lpam
@@ -197,8 +194,7 @@ runuser_SOURCES = \
        login-utils/runuser.c \
        login-utils/su-common.c \
        login-utils/su-common.h \
-       login-utils/logindefs.c \
-       login-utils/logindefs.h
+       lib/logindefs.c
 runuser_LDADD = $(LDADD) libcommon.la -lpam
 if HAVE_LINUXPAM
 runuser_LDADD += -lpam_misc
@@ -235,8 +231,7 @@ MANPAGES += login-utils/lslogins.1
 dist_noinst_DATA += login-utils/lslogins.1.adoc
 lslogins_SOURCES = \
        login-utils/lslogins.c \
-       login-utils/logindefs.c \
-       login-utils/logindefs.h
+       lib/logindefs.c
 lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la
 lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 if HAVE_SELINUX
@@ -271,22 +266,10 @@ INSTALL_EXEC_HOOKS += install-exec-hook-vipw
 endif # BUILD_VIPW
 
 
-check_PROGRAMS += \
-       test_islocal \
-       test_logindefs
-
+check_PROGRAMS += test_islocal
 test_islocal_SOURCES = login-utils/islocal.c
 test_islocal_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
 
-test_logindefs_SOURCES = \
-       login-utils/logindefs.c \
-       login-utils/logindefs.h
-test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
-test_logindefs_LDADD = $(LDADD) libcommon.la
-if HAVE_ECONF
-test_logindefs_LDADD += -leconf
-endif
-
 
 install-exec-hook:
 if BUILD_SU