summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 14:50:48 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 14:50:48 -0400
commit8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch)
tree20000a90a738370fff9e44c5e8fbaccea08e949c /src/libsystemd
parent7308e9ffd1933c71e6134e1b9632683977a12f47 (diff)
parentdb51244983a38d901fefd5e2a090f0e66343d98d (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/libsystemd')
-rw-r--r--src/libsystemd/Makefile4
-rw-r--r--src/libsystemd/compat-libs/Makefile4
-rw-r--r--src/libsystemd/include/systemd/sd-bus-vtable.h2
-rw-r--r--src/libsystemd/include/systemd/sd-bus.h8
-rw-r--r--src/libsystemd/include/systemd/sd-dhcp-client.h4
-rw-r--r--src/libsystemd/include/systemd/sd-dhcp-server.h2
-rw-r--r--src/libsystemd/include/systemd/sd-dhcp6-client.h4
-rw-r--r--src/libsystemd/include/systemd/sd-ipv4acd.h2
-rw-r--r--src/libsystemd/include/systemd/sd-ipv4ll.h2
-rw-r--r--src/libsystemd/include/systemd/sd-journal.h2
-rw-r--r--src/libsystemd/include/systemd/sd-lldp.h2
-rw-r--r--src/libsystemd/include/systemd/sd-messages.h2
-rw-r--r--src/libsystemd/include/systemd/sd-ndisc.h2
-rw-r--r--src/libsystemd/include/systemd/sd-netlink.h2
-rw-r--r--src/libsystemd/include/systemd/sd-resolve.h2
-rw-r--r--src/libsystemd/libsystemd-internal/Makefile4
-rw-r--r--src/libsystemd/libsystemd-journal-internal/Makefile27
17 files changed, 53 insertions, 22 deletions
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 0c3796b262..50de17357f 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -21,7 +21,7 @@
# 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)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
LIBSYSTEMD_CURRENT=14
LIBSYSTEMD_REVISION=0
@@ -282,4 +282,4 @@ nodist_test_libsystemd_sym_SOURCES = \
test_libsystemd_sym_LDADD = \
libsystemd.la
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile
index 166044e755..9ac9d1b560 100644
--- a/src/libsystemd/compat-libs/Makefile
+++ b/src/libsystemd/compat-libs/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
+
ifneq ($(ENABLE_COMPAT_LIBS),)
libsystemd-%.c: src/compat-libs/libsystemd-%.sym
$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -140,3 +143,4 @@ EXTRA_DIST += \
src/compat-libs/libsystemd-id128.pc.in \
src/compat-libs/libsystemd-daemon.pc.in
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/include/systemd/sd-bus-vtable.h b/src/libsystemd/include/systemd/sd-bus-vtable.h
index 6ad6d51979..9363f5425a 100644
--- a/src/libsystemd/include/systemd/sd-bus-vtable.h
+++ b/src/libsystemd/include/systemd/sd-bus-vtable.h
@@ -26,7 +26,7 @@ _SD_BEGIN_DECLARATIONS;
typedef struct sd_bus_vtable sd_bus_vtable;
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
enum {
_SD_BUS_VTABLE_START = '<',
diff --git a/src/libsystemd/include/systemd/sd-bus.h b/src/libsystemd/include/systemd/sd-bus.h
index 2a2ef0eb98..2ded47c2b6 100644
--- a/src/libsystemd/include/systemd/sd-bus.h
+++ b/src/libsystemd/include/systemd/sd-bus.h
@@ -25,8 +25,8 @@
#include <sys/types.h>
#include <sys/uio.h>
-#include "sd-event.h"
-#include "sd-id128.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-id128.h>
#include "_sd-common.h"
@@ -107,8 +107,8 @@ typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *
typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error);
typedef int (*sd_bus_track_handler_t) (sd_bus_track *track, void *userdata);
-#include "sd-bus-protocol.h"
-#include "sd-bus-vtable.h"
+#include <systemd/sd-bus-protocol.h>
+#include <systemd/sd-bus-vtable.h>
/* Connections */
diff --git a/src/libsystemd/include/systemd/sd-dhcp-client.h b/src/libsystemd/include/systemd/sd-dhcp-client.h
index 2b865a80e1..897a6b0223 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-client.h
+++ b/src/libsystemd/include/systemd/sd-dhcp-client.h
@@ -25,8 +25,8 @@
#include <netinet/in.h>
#include <sys/types.h>
-#include "sd-dhcp-lease.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp-lease.h>
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-dhcp-server.h b/src/libsystemd/include/systemd/sd-dhcp-server.h
index 8658197e80..ede8f18533 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-server.h
+++ b/src/libsystemd/include/systemd/sd-dhcp-server.h
@@ -24,7 +24,7 @@
#include <inttypes.h>
#include <netinet/in.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-dhcp6-client.h b/src/libsystemd/include/systemd/sd-dhcp6-client.h
index 9608060830..9c05336ab9 100644
--- a/src/libsystemd/include/systemd/sd-dhcp6-client.h
+++ b/src/libsystemd/include/systemd/sd-dhcp6-client.h
@@ -24,8 +24,8 @@
#include <net/ethernet.h>
#include <sys/types.h>
-#include "sd-dhcp6-lease.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp6-lease.h>
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-ipv4acd.h b/src/libsystemd/include/systemd/sd-ipv4acd.h
index 3a2219c82c..0fb52b33f9 100644
--- a/src/libsystemd/include/systemd/sd-ipv4acd.h
+++ b/src/libsystemd/include/systemd/sd-ipv4acd.h
@@ -24,7 +24,7 @@
#include <net/ethernet.h>
#include <netinet/in.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-ipv4ll.h b/src/libsystemd/include/systemd/sd-ipv4ll.h
index 67c566fe0d..2d1d51a473 100644
--- a/src/libsystemd/include/systemd/sd-ipv4ll.h
+++ b/src/libsystemd/include/systemd/sd-ipv4ll.h
@@ -23,7 +23,7 @@
#include <net/ethernet.h>
#include <netinet/in.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-journal.h b/src/libsystemd/include/systemd/sd-journal.h
index abb9eca576..559a8fa929 100644
--- a/src/libsystemd/include/systemd/sd-journal.h
+++ b/src/libsystemd/include/systemd/sd-journal.h
@@ -26,7 +26,7 @@
#include <sys/uio.h>
#include <syslog.h>
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-lldp.h b/src/libsystemd/include/systemd/sd-lldp.h
index ea952ef187..45d8a36697 100644
--- a/src/libsystemd/include/systemd/sd-lldp.h
+++ b/src/libsystemd/include/systemd/sd-lldp.h
@@ -24,7 +24,7 @@
#include <inttypes.h>
#include <net/ethernet.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-messages.h b/src/libsystemd/include/systemd/sd-messages.h
index 8a72576ec8..1aeac17851 100644
--- a/src/libsystemd/include/systemd/sd-messages.h
+++ b/src/libsystemd/include/systemd/sd-messages.h
@@ -20,7 +20,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-ndisc.h b/src/libsystemd/include/systemd/sd-ndisc.h
index 762947531d..734701bca3 100644
--- a/src/libsystemd/include/systemd/sd-ndisc.h
+++ b/src/libsystemd/include/systemd/sd-ndisc.h
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include <net/ethernet.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-netlink.h b/src/libsystemd/include/systemd/sd-netlink.h
index b4798d2476..333df4676f 100644
--- a/src/libsystemd/include/systemd/sd-netlink.h
+++ b/src/libsystemd/include/systemd/sd-netlink.h
@@ -26,7 +26,7 @@
#include <linux/rtnetlink.h>
#include <linux/neighbour.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/include/systemd/sd-resolve.h b/src/libsystemd/include/systemd/sd-resolve.h
index 903b917f70..9c3b0ee70f 100644
--- a/src/libsystemd/include/systemd/sd-resolve.h
+++ b/src/libsystemd/include/systemd/sd-resolve.h
@@ -25,7 +25,7 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include "sd-event.h"
+#include <systemd/sd-event.h>
#include "_sd-common.h"
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 995eff1659..c85835a94d 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -21,7 +21,7 @@
# 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)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
libsystemd_internal_la_SOURCES = \
src/systemd/sd-bus.h \
@@ -128,4 +128,4 @@ $(outdir)/libsystemd-internal.la: \
$(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \
$(libbasic.DEPENDS) -lresolv
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index 210ca07d5d..306d6db7f3 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -1,3 +1,28 @@
+# -*- 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 <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
src/systemd/sd-messages.h \
@@ -69,3 +94,5 @@ endif
noinst_LTLIBRARIES += \
libsystemd-journal-internal.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-01-24 15:00:49 +0000