From 355d214ececcb69a48db364ea80c58b1902ddebd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 1 Jun 2016 15:43:25 -0400 Subject: ./move.sh --- src/bus-proxyd/Makefile | 80 +++++++++++++++++++++++++++++++++++- src/bus-proxyd/bus-proxyd.c | 2 +- src/bus-proxyd/bus-xml-policy.c | 2 +- src/bus-proxyd/driver.c | 2 +- src/bus-proxyd/driver.h | 2 +- src/bus-proxyd/proxy.c | 4 +- src/bus-proxyd/proxy.h | 2 +- src/bus-proxyd/stdio-bridge.c | 4 +- src/bus-proxyd/synthesize.c | 2 +- src/bus-proxyd/synthesize.h | 2 +- src/bus-proxyd/test-bus-xml-policy.c | 2 +- 11 files changed, 91 insertions(+), 13 deletions(-) mode change 120000 => 100644 src/bus-proxyd/Makefile (limited to 'src/bus-proxyd') diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile deleted file mode 120000 index d0b0e8e008..0000000000 --- a/src/bus-proxyd/Makefile +++ /dev/null @@ -1 +0,0 @@ -../Makefile \ No newline at end of file diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile new file mode 100644 index 0000000000..fb8e2826f6 --- /dev/null +++ b/src/bus-proxyd/Makefile @@ -0,0 +1,79 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see . +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +noinst_LTLIBRARIES += \ + libbus-proxy-core.la + +libbus_proxy_core_la_SOURCES = \ + src/bus-proxyd/bus-xml-policy.c \ + src/bus-proxyd/bus-xml-policy.h \ + src/bus-proxyd/driver.c \ + src/bus-proxyd/driver.h \ + src/bus-proxyd/proxy.c \ + src/bus-proxyd/proxy.h \ + src/bus-proxyd/synthesize.c \ + src/bus-proxyd/synthesize.h + +libbus_proxy_core_la_LIBADD = \ + libshared.la + +systemd_bus_proxyd_SOURCES = \ + src/bus-proxyd/bus-proxyd.c + +systemd_bus_proxyd_LDADD = \ + libbus-proxy-core.la \ + libshared.la + +systemd_stdio_bridge_SOURCES = \ + src/bus-proxyd/stdio-bridge.c + +systemd_stdio_bridge_LDADD = \ + libbus-proxy-core.la \ + libshared.la + +nodist_systemunit_DATA += \ + units/systemd-bus-proxyd.service + +dist_systemunit_DATA += \ + units/systemd-bus-proxyd.socket + +nodist_userunit_DATA += \ + units/user/systemd-bus-proxyd.service + +dist_userunit_DATA += \ + units/user/systemd-bus-proxyd.socket + +EXTRA_DIST += \ + units/systemd-bus-proxyd.service.m4.in \ + units/user/systemd-bus-proxyd.service.in + +ifneq ($(HAVE_SMACK),) +bus-proxyd-set-cap-hook: + -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd + +INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook +endif + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index b6bd6eb390..17b80c3e9a 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -29,7 +29,7 @@ #include #include -#include "sd-daemon.h" +#include #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c index 8943e0dc12..86a8362142 100644 --- a/src/bus-proxyd/bus-xml-policy.c +++ b/src/bus-proxyd/bus-xml-policy.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "sd-login.h" +#include #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c index 1af5c310ea..133b2e0f39 100644 --- a/src/bus-proxyd/driver.c +++ b/src/bus-proxyd/driver.c @@ -23,7 +23,7 @@ #include #include -#include "sd-bus.h" +#include #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/bus-proxyd/driver.h b/src/bus-proxyd/driver.h index 1630cdc7b9..cad7aa7851 100644 --- a/src/bus-proxyd/driver.h +++ b/src/bus-proxyd/driver.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "sd-bus.h" +#include #include "bus-xml-policy.h" #include "proxy.h" diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c index 907d93d4c7..bcfbab0dad 100644 --- a/src/bus-proxyd/proxy.c +++ b/src/bus-proxyd/proxy.c @@ -26,8 +26,8 @@ #include #include -#include "sd-bus.h" -#include "sd-daemon.h" +#include +#include #include "alloc-util.h" #include "bus-control.h" diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h index d9e75cf73b..0e3ed8a87a 100644 --- a/src/bus-proxyd/proxy.h +++ b/src/bus-proxyd/proxy.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "sd-bus.h" +#include #include "bus-xml-policy.h" diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c index 291c1b09e3..60c4a08325 100644 --- a/src/bus-proxyd/stdio-bridge.c +++ b/src/bus-proxyd/stdio-bridge.c @@ -25,8 +25,8 @@ #include #include -#include "sd-bus.h" -#include "sd-daemon.h" +#include +#include #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/bus-proxyd/synthesize.c b/src/bus-proxyd/synthesize.c index 8eea7dc5b9..7562f29ecb 100644 --- a/src/bus-proxyd/synthesize.c +++ b/src/bus-proxyd/synthesize.c @@ -21,7 +21,7 @@ #include -#include "sd-bus.h" +#include #include "bus-internal.h" #include "bus-match.h" diff --git a/src/bus-proxyd/synthesize.h b/src/bus-proxyd/synthesize.h index 1b7197f8ec..cb8c21cdb7 100644 --- a/src/bus-proxyd/synthesize.h +++ b/src/bus-proxyd/synthesize.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "sd-bus.h" +#include #include "proxy.h" diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c index af7c9128a2..6f32c09789 100644 --- a/src/bus-proxyd/test-bus-xml-policy.c +++ b/src/bus-proxyd/test-bus-xml-policy.c @@ -21,7 +21,7 @@ #include #include -#include "sd-bus.h" +#include #include "alloc-util.h" #include "bus-xml-policy.h" -- cgit v1.2.3-54-g00ecf