reverted to smack.h

diff --git a/Makefile.am b/Makefile.am
index f06c999..af4ec62 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 
 library_includedir=$(includedir)
-library_include_HEADERS=libsmack/libsmack.h
+library_include_HEADERS=libsmack/sys/smack.h
 
 SUBDIRS = libsmack utils doc
 

diff --git a/doc/Doxyfile b/doc/Doxyfile
index c234711..8401c27 100644 (file)
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -571,7 +571,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../$(SRCDIR)/libsmack/libsmack.h
+INPUT                  = ../$(SRCDIR)/libsmack/sys/smack.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/libsmack/libsmack.c b/libsmack/libsmack.c
index 8d82f43..a33b070 100644 (file)
--- a/libsmack/libsmack.c
+++ b/libsmack/libsmack.c
@@ -23,7 +23,7 @@
  * Brian McGillion <brian.mcgillion@intel.com>
  */
 
-#include "libsmack.h"
+#include "sys/smack.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>

diff --git a/libsmack/libsmack.h b/libsmack/sys/smack.h
similarity index 99%
rename from libsmack/libsmack.h
rename to libsmack/sys/smack.h
index 5c0e07d..9c12b63 100644 (file)
--- a/libsmack/libsmack.h
+++ b/libsmack/sys/smack.h
@@ -23,8 +23,6 @@
  */
 
 /*!
- * @file libsmack.h
- *
  * Smack user space library
  */
 

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 8190874..e110a73 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,7 +1,7 @@
-AM_CPPFLAGS = -I../libsmack
-
 instdir = ${bindir}
 inst_PROGRAMS = smackctl smackaccess smackself
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/libsmack
 
 smackctl_SOURCES = smackctl.c
 smackctl_LDADD = ../libsmack/libsmack.la

diff --git a/utils/smackaccess.c b/utils/smackaccess.c
index 026933c..4251687 100644 (file)
--- a/utils/smackaccess.c
+++ b/utils/smackaccess.c
@@ -22,7 +22,7 @@
  * Jarkko Sakkinen <jarkko.sakkinen@intel.com>
  */
 
-#include <libsmack.h>
+#include <sys/smack.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>

diff --git a/utils/smackctl.c b/utils/smackctl.c
index 9015655..7ab7d51 100644 (file)
--- a/utils/smackctl.c
+++ b/utils/smackctl.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <libsmack.h>
+#include <sys/smack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/utils/smackself.c b/utils/smackself.c
index 937b573..55afea0 100644 (file)
--- a/utils/smackself.c
+++ b/utils/smackself.c
@@ -22,7 +22,7 @@
  * Jarkko Sakkinen <jarkko.sakkinen@intel.com>
  */
 
-#include <libsmack.h>
+#include <sys/smack.h>
 #include <stdio.h>
 #include <stdlib.h>