From 9c9b5ae7cf7d79c83a62d6842f50b6b8a1ae1183 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 4 Jun 2016 17:06:17 -0400
Subject: stuff

---
 src/libshared/Makefile                              |  9 +++++----
 src/libsystemd/libsystemd-journal-internal/Makefile |  2 +-
 src/systemd-nspawn/Makefile                         | 16 ++++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 5a4c868193..4c1b794812 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -130,18 +130,19 @@ libshared_la_CFLAGS = \
 	$(SECCOMP_CFLAGS)
 
 libshared_la_LIBADD = \
-	libsystemd-internal.la \
-	libsystemd-journal-internal.la \
+	$(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la \
+	$(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la \
 	libudev-internal.la \
 	$(ACL_LIBS) \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
 $(eval $(value automake2autothing))
-at.depdirs +=
+at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
+at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal
 AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
 AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
-AM_CPPFLAGS += -I$(topsrcdir)/src/journal
 
 AM_CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 AM_CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\"
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index 8edcf2873d..b502bc8e40 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-audit_list_includes = -include linux/audit.h -include $(call at.path,$(topsrcdir)/src/libbasic/missing.h)
+audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h
 ifneq ($(HAVE_AUDIT),)
 audit_list_includes += -include libaudit.h
 endif
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index cca337be90..49de89d302 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -58,24 +58,24 @@ systemd_nspawn_CFLAGS = \
 	$(SECCOMP_CFLAGS)
 
 systemd_nspawn_LDADD = \
-	libshared.la \
+	$(topoutdir)/libshared/libshared.la \
 	$(BLKID_LIBS)
 
 ifneq ($(HAVE_LIBIPTC),)
 systemd_nspawn_LDADD += \
-	libfirewall.la
+	$(topoutdir)/libfirewall/libfirewall.la
 endif
 
 bin_PROGRAMS += systemd-nspawn
 $(eval $(value automake2autothing))
-
+at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall)
 CPPFLAGS += $(libbasic.CPPFLAGS)
 CPPFLAGS += $(libshared.CPPFLAGS)
 CPPFLAGS += $(libsystemd.CPPFLAGS)
-CPPFLAGS += $(libudev.CPPFLAGS)
-CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink
-CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-bus
-CPPFLAGS += -I$(topsrcdir)/src
-CPPFLAGS += /udev -I$(topsrcdir)/src/libudev/src
+CPPFLAGS += $(libfirewall.CPPFLAGS)
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+CPPFLAGS += -I$(topsrcdir)/src/udev
+CPPFLAGS += -I$(topsrcdir)/src/libudev/src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
-- 
cgit v1.2.3-54-g00ecf