From 13969cb2abf0014d28ac76c50763db501578522f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 12 Jun 2016 11:11:33 -0400
Subject: fixity

---
 src/Makefile                                             |  1 -
 src/libsystemd/libsystemd-internal/Makefile              | 15 +++++----------
 src/libsystemd/libsystemd-internal/subdir.mk             |  2 +-
 src/libsystemd/libsystemd-journal-internal/gcrypt-util.c |  1 +
 src/libsystemd/libsystemd-journal-internal/gcrypt-util.h |  1 +
 5 files changed, 8 insertions(+), 12 deletions(-)
 create mode 120000 src/libsystemd/libsystemd-journal-internal/gcrypt-util.c
 create mode 120000 src/libsystemd/libsystemd-journal-internal/gcrypt-util.h

diff --git a/src/Makefile b/src/Makefile
index aed2496c29..7745eaa87c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,7 +25,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 
 at.subdirs += busctl
 at.subdirs += grp-boot
-at.subdirs += grp-coredump
 at.subdirs += libbasic
 at.subdirs += libfirewall
 at.subdirs += libshared
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 1b3364f7f5..1637753248 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -115,7 +115,7 @@ libsystemd_internal_la_LIBADD = \
 	libbasic.la \
 	-lresolv
 
-noinst_LTLIBRARIES += \
+_noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
 test_bus_marshal_SOURCES = \
@@ -242,14 +242,9 @@ test_resolve_SOURCES = \
 test_resolve_LDADD = \
 	libshared.la
 
-at.subdirs += $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la))))
-at.depdirs += $(topoutdir)/src/libbasic
-$(outdir)/libsystemd-internal.la: $(patsubst src/libsystemd/%,$(srcdir)/%,$(filter %.c,$(libsystemd_internal_la_SOURCES)))
-libsystemd_internal_la_SOURCES =
-systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
-systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
-systemd.CPPFLAGS += $(libshared.CPPFLAGS)
-systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+at.out_files += libsystemd-internal.la
+libsystemd-internal.la_SOURCES = $(patsubst src/libsystemd/%,%,$(filter %.c,$(libsystemd_internal_la_SOURCES)))
+$(outdir)/libsystemd-internal.la: $(addprefix $(outdir)/,$(libsystemd-internal.la_SOURCES:.c=.o))
+at.subdirs += $(sort $(patsubst %/,%,$(dir $(libsystemd-internal.la_SOURCES))))
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk
index ceeff9ca0e..30b6593b42 100644
--- a/src/libsystemd/libsystemd-internal/subdir.mk
+++ b/src/libsystemd/libsystemd-internal/subdir.mk
@@ -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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
diff --git a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c
new file mode 120000
index 0000000000..79dc82a466
--- /dev/null
+++ b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c
@@ -0,0 +1 @@
+../../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
new file mode 120000
index 0000000000..6da58160eb
--- /dev/null
+++ b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h
@@ -0,0 +1 @@
+../../libshared/gcrypt-util.h
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf