libapparmor: move public headers to separate directory

This patch moves the apparmor.h and aalogparse.h headers
from the libapparmor/src/ directory to a new directory
libapparmor/include/. The apparmor.h header is stored in a sys/
directory within libapparmor/include/ to match its usual install
location in /usr/include/sys/, simplifying the #include statements of
source that wishes to include either the in-tree or system installed
version of the header (i.e. #include <sys/apparmor.h> can be used
everywhere).

The patch size is inflated by the movements of the header files, which
are unchanged except for their locations. Otherwise, the rest of the
changes are to modify the include search path or to stop looking in
$CWD for one of the headers.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Tyler Hicks <tyhicks@canonical.com>

libraries/libapparmor/swig/python/Makefile.am

@@ -5,7 +5,7 @@ EXTRA_DIST      = libapparmor_wrap.c
 SUBDIRS = test
 
 libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
-	$(SWIG) -python -I$(srcdir)/../../src -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
+	$(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
 	mv LibAppArmor.py __init__.py
 
 MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py

libraries/libapparmor/swig/python/setup.py.in

@@ -12,7 +12,7 @@ setup(name          = 'LibAppArmor',
       packages      = [ 'LibAppArmor' ],
       ext_package   = 'LibAppArmor',
       ext_modules   = [Extension('_LibAppArmor', ['libapparmor_wrap.c'],
-                                 include_dirs=['@top_srcdir@/src'],
+                                 include_dirs=['@top_srcdir@/include'],
                                  extra_link_args = '-L@top_builddir@/src/.libs -lapparmor'.split(),
                     )],
       scripts       = [],