Imported Upstream version 1.9.12upstream/1.9.12

1 files changed, 29 insertions, 20 deletions

diff --git a/bus/Makefile.in b/bus/Makefile.in
index 6bbcecd6..f162f171 100644
--- a/bus/Makefile.in
+++ b/bus/Makefile.in
@@ -136,21 +136,21 @@ am__installdirs = "$(DESTDIR)$(dbus_daemon_execdir)" \
 PROGRAMS = $(dbus_daemon_exec_PROGRAMS) $(libexec_PROGRAMS) \
 	$(noinst_PROGRAMS)
 am__dbus_daemon_SOURCES_DIST = activation.c activation.h \
-	activation-exit-codes.h bus.c bus.h config-parser.c \
-	config-parser.h config-parser-common.c config-parser-common.h \
-	connection.c connection.h desktop-file.c desktop-file.h \
-	dir-watch-default.c dir-watch-inotify.c dir-watch-kqueue.c \
-	dir-watch.h dispatch.c dispatch.h driver.c driver.h \
-	expirelist.c expirelist.h policy.c policy.h selinux.h \
-	selinux.c services.c services.h signals.c signals.h stats.c \
-	stats.h test.c test.h utils.c utils.h config-loader-expat.c \
-	main.c
+	activation-exit-codes.h apparmor.c apparmor.h bus.c bus.h \
+	config-parser.c config-parser.h config-parser-common.c \
+	config-parser-common.h connection.c connection.h \
+	desktop-file.c desktop-file.h dir-watch-default.c \
+	dir-watch-inotify.c dir-watch-kqueue.c dir-watch.h dispatch.c \
+	dispatch.h driver.c driver.h expirelist.c expirelist.h \
+	policy.c policy.h selinux.h selinux.c services.c services.h \
+	signals.c signals.h stats.c stats.h test.c test.h utils.c \
+	utils.h config-loader-expat.c main.c
 @DBUS_BUS_ENABLE_INOTIFY_FALSE@@DBUS_BUS_ENABLE_KQUEUE_FALSE@am__objects_1 = dir-watch-default.$(OBJEXT)
 @DBUS_BUS_ENABLE_INOTIFY_TRUE@@DBUS_BUS_ENABLE_KQUEUE_FALSE@am__objects_1 = dir-watch-inotify.$(OBJEXT)
 @DBUS_BUS_ENABLE_KQUEUE_TRUE@am__objects_1 =  \
 @DBUS_BUS_ENABLE_KQUEUE_TRUE@	dir-watch-kqueue.$(OBJEXT)
 am__objects_2 = config-loader-expat.$(OBJEXT)
-am__objects_3 = activation.$(OBJEXT) bus.$(OBJEXT) \
+am__objects_3 = activation.$(OBJEXT) apparmor.$(OBJEXT) bus.$(OBJEXT) \
 	config-parser.$(OBJEXT) config-parser-common.$(OBJEXT) \
 	connection.$(OBJEXT) desktop-file.$(OBJEXT) $(am__objects_1) \
 	dispatch.$(OBJEXT) driver.$(OBJEXT) expirelist.$(OBJEXT) \
@@ -162,7 +162,7 @@ dbus_daemon_OBJECTS = $(am_dbus_daemon_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 dbus_daemon_DEPENDENCIES = $(top_builddir)/dbus/libdbus-internal.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -195,15 +195,15 @@ dbus_daemon_launch_helper_test_OBJECTS =  \
 dbus_daemon_launch_helper_test_DEPENDENCIES =  \
 	$(top_builddir)/dbus/libdbus-internal.la $(am__DEPENDENCIES_3)
 am__test_bus_SOURCES_DIST = activation.c activation.h \
-	activation-exit-codes.h bus.c bus.h config-parser.c \
-	config-parser.h config-parser-common.c config-parser-common.h \
-	connection.c connection.h desktop-file.c desktop-file.h \
-	dir-watch-default.c dir-watch-inotify.c dir-watch-kqueue.c \
-	dir-watch.h dispatch.c dispatch.h driver.c driver.h \
-	expirelist.c expirelist.h policy.c policy.h selinux.h \
-	selinux.c services.c services.h signals.c signals.h stats.c \
-	stats.h test.c test.h utils.c utils.h config-loader-expat.c \
-	test-main.c
+	activation-exit-codes.h apparmor.c apparmor.h bus.c bus.h \
+	config-parser.c config-parser.h config-parser-common.c \
+	config-parser-common.h connection.c connection.h \
+	desktop-file.c desktop-file.h dir-watch-default.c \
+	dir-watch-inotify.c dir-watch-kqueue.c dir-watch.h dispatch.c \
+	dispatch.h driver.c driver.h expirelist.c expirelist.h \
+	policy.c policy.h selinux.h selinux.c services.c services.h \
+	signals.c signals.h stats.c stats.h test.c test.h utils.c \
+	utils.h config-loader-expat.c test-main.c
 am_test_bus_OBJECTS = $(am__objects_3) test-main.$(OBJEXT)
 test_bus_OBJECTS = $(am_test_bus_OBJECTS)
 test_bus_DEPENDENCIES = $(top_builddir)/dbus/libdbus-internal.la \
@@ -328,6 +328,8 @@ ACLOCAL = @ACLOCAL@
 ADT_LIBS = @ADT_LIBS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APPARMOR_CFLAGS = @APPARMOR_CFLAGS@
+APPARMOR_LIBS = @APPARMOR_LIBS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -382,6 +384,7 @@ DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUCKTYPE = @DUCKTYPE@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -471,6 +474,7 @@ X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+YELP_BUILD = @YELP_BUILD@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -535,6 +539,7 @@ dbus_daemon_execdir = $(DBUS_DAEMONDIR)
 DBUS_BUS_LIBS = \
 	$(XML_LIBS) \
 	$(SELINUX_LIBS) \
+	$(APPARMOR_LIBS) \
 	$(THREAD_LIBS) \
 	$(ADT_LIBS) \
 	$(NETWORK_libs) \
@@ -549,6 +554,7 @@ DBUS_LAUNCHER_LIBS = \
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(XML_CFLAGS) \
+	$(APPARMOR_CFLAGS) \
 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
 	-DDBUS_COMPILATION \
 	-DDBUS_STATIC_BUILD \
@@ -583,6 +589,8 @@ BUS_SOURCES = \
 	activation.c				\
 	activation.h				\
 	activation-exit-codes.h			\
+	apparmor.c				\
+	apparmor.h				\
 	bus.c					\
 	bus.h					\
 	config-parser.c				\
@@ -976,6 +984,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/activation-helper-bin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/activation-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/activation.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apparmor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config-loader-expat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config-parser-common.Po@am__quote@