fix (mostly adjust #includes to have sd- prefix)

19 files changed, 53 insertions, 20 deletions

diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 97fa201656..a193f4592d 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -108,7 +108,7 @@ test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
 $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym
-at.subdirs += libsystemd-internal libsystemd-journal-internal
+at.subdirs += src
 systemd.sed_files += libsystemd.pc
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c
deleted file mode 120000
index 79dc82a466..0000000000
--- a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c
+++ /dev/null
@@ -1 +0,0 @@
-../../libshared/gcrypt-util.c
\ No newline at end of file
diff --git a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h
deleted file mode 120000
index 6da58160eb..0000000000
--- a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h
+++ /dev/null
@@ -1 +0,0 @@
-../../libshared/gcrypt-util.h
\ No newline at end of file
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index 38c7d3a64f..44bf110437 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -23,17 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h
-ifneq ($(HAVE_AUDIT),)
-audit_list_includes += -include libaudit.h
-endif # HAVE_AUDIT
-
-$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/missing.h)
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
-
-$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
-
 _libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
@@ -103,6 +92,8 @@ _libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-netlink/netlink-types.c \
 	src/libsystemd/sd-netlink/netlink-util.h \
 	src/libsystemd/sd-netlink/netlink-util.c \
+	src/libsystemd/sd-netlink/local-addresses.h \
+	src/libsystemd/sd-netlink/local-addresses.c \
 	src/libsystemd/sd-id128/sd-id128.c \
 	src/libsystemd/sd-daemon/sd-daemon.c \
 	src/libsystemd/sd-login/sd-login.c \
@@ -327,16 +318,16 @@ libsystemd_journal_internal_la_CFLAGS += \
 	-Wno-pointer-arith
 endif # HAVE_GCRYPT
 
-noinst_LTLIBRARIES += \
+_noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
 
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
-$(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h
+libsystemd_internal_la_CFLAGS   += $(libsystemd_journal_internal_la_CFLAGS)
+libsystemd_internal_la_LIBADD   += $(libsystemd_journal_internal_la_LIBADD)
+libsystemd_internal_la_LDADD    += $(libsystemd_journal_internal_la_LDADD)
 
 libsystemd-internal.la.SOURCES =
-libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,src/%,$(filter %.c,$(_libsystemd_internal_la_SOURCES)))
-libsystemd-internal.la.SOURCES += $(addprefix src/sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES))))
+libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES)))
+libsystemd-internal.la.SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES))))
 libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo))
 at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES)))
 
diff --git a/src/libsystemd/libsystemd-internal/sd-bus/Makefile b/src/libsystemd/src/sd-bus/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-bus/Makefile
+++ b/src/libsystemd/src/sd-bus/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile b/src/libsystemd/src/sd-daemon/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile
+++ b/src/libsystemd/src/sd-daemon/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-device/Makefile b/src/libsystemd/src/sd-device/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-device/Makefile
+++ b/src/libsystemd/src/sd-device/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-event/Makefile b/src/libsystemd/src/sd-event/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-event/Makefile
+++ b/src/libsystemd/src/sd-event/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile b/src/libsystemd/src/sd-hwdb/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile
+++ b/src/libsystemd/src/sd-hwdb/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-id128/Makefile b/src/libsystemd/src/sd-id128/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-id128/Makefile
+++ b/src/libsystemd/src/sd-id128/Makefile
diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile
new file mode 100644
index 0000000000..7f1caf0836
--- /dev/null
+++ b/src/libsystemd/src/sd-journal/Makefile
@@ -0,0 +1,42 @@
+#  -*- 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
+
+audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h
+ifneq ($(HAVE_AUDIT),)
+audit_list_includes += -include libaudit.h
+endif # HAVE_AUDIT
+
+$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/missing.h)
+	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
+
+$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
+
+systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+$(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.c b/src/libsystemd/src/sd-journal/gcrypt-util.c
new file mode 120000
index 0000000000..2bd8bde8da
--- /dev/null
+++ b/src/libsystemd/src/sd-journal/gcrypt-util.c
@@ -0,0 +1 @@
+../../../libshared/gcrypt-util.c
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.h b/src/libsystemd/src/sd-journal/gcrypt-util.h
new file mode 120000
index 0000000000..6de2527ac8
--- /dev/null
+++ b/src/libsystemd/src/sd-journal/gcrypt-util.h
@@ -0,0 +1 @@
+../../../libshared/gcrypt-util.h
\ No newline at end of file
diff --git a/src/libsystemd/libsystemd-internal/sd-login/Makefile b/src/libsystemd/src/sd-login/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-login/Makefile
+++ b/src/libsystemd/src/sd-login/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile b/src/libsystemd/src/sd-netlink/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile
+++ b/src/libsystemd/src/sd-netlink/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-network/Makefile b/src/libsystemd/src/sd-network/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-network/Makefile
+++ b/src/libsystemd/src/sd-network/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-path/Makefile b/src/libsystemd/src/sd-path/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-path/Makefile
+++ b/src/libsystemd/src/sd-path/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile b/src/libsystemd/src/sd-resolve/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile
+++ b/src/libsystemd/src/sd-resolve/Makefile
diff --git a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile b/src/libsystemd/src/sd-utf8/Makefile
index 71a1159ce0..71a1159ce0 120000
--- a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile
+++ b/src/libsystemd/src/sd-utf8/Makefile