Rename library, header file and export it.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>

diff --git a/packaging/ima-evm-utils.spec b/packaging/ima-evm-utils.spec
index e4af1c3..c46eb06 100644 (file)
--- a/packaging/ima-evm-utils.spec
+++ b/packaging/ima-evm-utils.spec
@@ -44,7 +44,8 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/libevm.*
+%{_libdir}/libimaevm.*
+%{_includedir}/*
 
 %changelog
 * Thu Apr 05 2012 Dmitry Kasatkin <dmitry.kasatkin@intel.com>

diff --git a/packaging/ima-evm-utils.spec.in b/packaging/ima-evm-utils.spec.in
index 17fd98a..7ca6c6f 100644 (file)
--- a/packaging/ima-evm-utils.spec.in
+++ b/packaging/ima-evm-utils.spec.in
@@ -44,7 +44,8 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/libevm.*
+%{_libdir}/libimaevm.*
+%{_includedir}/*
 
 %changelog
 * Thu Apr 05 2012 Dmitry Kasatkin <dmitry.kasatkin@intel.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 18174d5..deb18fb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,20 @@
-lib_LTLIBRARIES = libevm.la
+lib_LTLIBRARIES = libimaevm.la
 
-libevm_la_SOURCES = libevm.c
-libevm_la_CPPFLAGS = $(OPENSSL_CFLAGS)
+libimaevm_la_SOURCES = libimaevm.c
+libimaevm_la_CPPFLAGS = $(OPENSSL_CFLAGS)
 # current[:revision[:age]]
 # result: [current-age].age.revision
-libevm_la_LDFLAGS = -version-info 0:0:0
-libevm_la_LIBADD =  $(OPENSSL_LIBS)
+libimaevm_la_LDFLAGS = -version-info 0:0:0
+libimaevm_la_LIBADD =  $(OPENSSL_LIBS)
+
+include_HEADERS = imaevm.h
 
 bin_PROGRAMS = evmctl
 
 evmctl_SOURCES = evmctl.c
 evmctl_CPPFLAGS = $(OPENSSL_CFLAGS)
 evmctl_LDFLAGS = $(LDFLAGS_READLINE)
-evmctl_LDADD =  $(OPENSSL_LIBS) -lkeyutils libevm.la
+evmctl_LDADD =  $(OPENSSL_LIBS) -lkeyutils libimaevm.la
 
 INCLUDES = -I$(top_srcdir) -include config.h
 

diff --git a/src/evmctl.c b/src/evmctl.c
index e5c9357..209f663 100644 (file)
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -45,7 +45,7 @@
 
 #define USE_FPRINTF
 
-#include <libevm.h>
+#include "imaevm.h"
 
 static char *evm_config_xattrnames[] = {
        "security.selinux",

diff --git a/src/libevm.h b/src/imaevm.h
similarity index 98%
rename from src/libevm.h
rename to src/imaevm.h
index a9e91dc..4789e43 100644 (file)
--- a/src/libevm.h
+++ b/src/imaevm.h
@@ -1,5 +1,5 @@
-#ifndef _LIBEVM_H
-#define _LIBEVM_H
+#ifndef _LIBIMAEVM_H
+#define _LIBIMAEVM_H
 
 #include <sys/types.h>
 #include <stdint.h>

diff --git a/src/libevm.c b/src/libimaevm.c
similarity index 99%
rename from src/libevm.c
rename to src/libimaevm.c
index 128f74c..3d780c6 100644 (file)
--- a/src/libevm.c
+++ b/src/libimaevm.c
@@ -26,7 +26,7 @@
 /* should we use logger instead for library? */
 #define USE_FPRINTF
 
-#include "libevm.h"
+#include "imaevm.h"
 
 const char *const pkey_hash_algo[PKEY_HASH__LAST] = {
        [PKEY_HASH_MD4]         = "md4",