build-sys: move selinux_utils.c

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

diff --git a/include/Makemodule.am b/include/Makemodule.am
index ed03ace7b7c34bafc149c1b021a02b1dc5f60e6c..417125bcfd1f7182c6aa00f9d0b4b8cf73d58e25 100644 (file)
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -58,6 +58,7 @@ dist_noinst_HEADERS += \
        include/rpmatch.h \
        include/sha1.h \
        include/signames.h \
+       include/selinux-utils.h \
        include/statfs_magic.h \
        include/strutils.h \
        include/strv.h \

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

diff --git a/login-utils/selinux_utils.c b/lib/selinux-utils.c
similarity index 95%
rename from login-utils/selinux_utils.c
rename to lib/selinux-utils.c
index a898b537d268c8dd5dac332512feeede34f40140..fb33f82983bc3709909d6a641c29d2cb14cb5eb2 100644 (file)
--- a/login-utils/selinux_utils.c
+++ b/lib/selinux-utils.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "selinux_utils.h"
+#include "selinux-utils.h"
 
 access_vector_t get_access_vector(const char *tclass, const char *op)
 {

diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 8bc3ee37ee507d6da4b0def4532f9a084b2e56a8..2ee832083cbf03af41226dfce6ca7639457b665d 100644 (file)
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -129,8 +129,8 @@ endif
 
 if HAVE_SELINUX
 chfn_chsh_sources += \
-       login-utils/selinux_utils.c \
-       login-utils/selinux_utils.h
+       lib/selinux-utils.c \
+       include/selinux-utils.h
 chfn_chsh_ldadd += -lselinux
 endif
 

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index be122c78d8d5375a571171b62085f98288434ef4..a06a0ec7c99555830b9077b45da6a8afc8e1e57f 100644 (file)
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -46,7 +46,7 @@
 
 #ifdef HAVE_LIBSELINUX
 # include <selinux/selinux.h>
-# include "selinux_utils.h"
+# include "selinux-utils.h"
 #endif
 
 #ifdef HAVE_LIBUSER

diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 05e475403c682f30d2f7b64b2451399e92e21769..e2ed81d555917b87faa8e0eb2c6060d9b6ca7fbd 100644 (file)
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -47,7 +47,7 @@
 
 #ifdef HAVE_LIBSELINUX
 # include <selinux/selinux.h>
-# include "selinux_utils.h"
+# include "selinux-utils.h"
 #endif