diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 14:50:48 -0400 |
| commit | 8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch) | |
| tree | 20000a90a738370fff9e44c5e8fbaccea08e949c /src/socket-proxy | |
| parent | 7308e9ffd1933c71e6134e1b9632683977a12f47 (diff) | |
| parent | db51244983a38d901fefd5e2a090f0e66343d98d (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# am-pretty.mk
# config.mk.in
# src/journal/Makefile
# src/kernel-install/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libsystemd/src/Makefile
# src/systemd-nspawn/Makefile
# src/systemd-nspawn/nspawn-network.c
# src/udev/udev.h
Diffstat (limited to 'src/socket-proxy')
| -rw-r--r-- | src/socket-proxy/Makefile | 4 | ||||
| -rw-r--r-- | src/socket-proxy/socket-proxyd.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/socket-proxy/Makefile b/src/socket-proxy/Makefile index 27edeb2d95..cead4f37a9 100644 --- a/src/socket-proxy/Makefile +++ b/src/socket-proxy/Makefile @@ -20,6 +20,9 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + systemd_socket_proxyd_SOURCES = \ src/socket-proxy/socket-proxyd.c @@ -27,3 +30,4 @@ systemd_socket_proxyd_SOURCES = \ systemd_socket_proxyd_LDADD = \ libshared.la +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 99d4b62139..4be8d0507f 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -28,9 +28,9 @@ #include <sys/un.h> #include <unistd.h> -#include "sd-daemon.h" -#include "sd-event.h" -#include "sd-resolve.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> +#include <systemd/sd-resolve.h> #include "alloc-util.h" #include "fd-util.h" |