stuff

6 files changed, 19 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 55ce861333..a15804417a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,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
 
 at.subdirs += src
diff --git a/src/Makefile b/src/Makefile
index 9aa98640dd..aed2496c29 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,6 +25,12 @@ 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
+at.subdirs += libsystemd
+at.subdirs += libudev
 at.subdirs += systemd-nspawn
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 6bc8725521..4e05381339 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -27,6 +27,8 @@ noinst_LTLIBRARIES += \
 	libshared.la
 
 libshared_la_SOURCES = \
+	src/libsystemd/sd-netlink/local-addresses.h \
+	src/libsystemd/sd-netlink/local-addresses.c \
 	src/shared/output-mode.h \
 	src/shared/gpt.h \
 	src/shared/udev-util.h \
@@ -137,11 +139,18 @@ libshared_la_LIBADD = \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
+test_local_addresses_SOURCES = \
+	src/libsystemd/sd-netlink/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+	libshared.la
+
 $(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal
 at.depdirs += $(topoutdir)/src/libudev/src
 AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += $(libsystemd.CPPFLAGS)
 AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
 AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
 
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 203db9f4aa..47db55a00d 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -50,11 +50,11 @@ EXTRA_DIST += \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-libsystemd_la_SOURCES = \
+_libsystemd_la_SOURCES = \
 	$(libsystemd_internal_la_SOURCES) \
 	$(libsystemd_journal_internal_la_SOURCES)
 
-nodist_libsystemd_la_SOURCES = \
+_nodist_libsystemd_la_SOURCES = \
 	$(nodist_libsystemd_internal_la_SOURCES)
 
 libsystemd_la_CFLAGS = \
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 4bd6b8c355..76818c80cf 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -92,8 +92,6 @@ 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 \
@@ -244,12 +242,6 @@ test_netlink_SOURCES = \
 test_netlink_LDADD = \
 	libshared.la
 
-test_local_addresses_SOURCES = \
-	src/libsystemd/sd-netlink/test-local-addresses.c
-
-test_local_addresses_LDADD = \
-	libshared.la
-
 test_resolve_SOURCES = \
 	src/libsystemd/sd-resolve/test-resolve.c
 
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 2c31d3efe0..d36fa93e0e 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -75,6 +75,7 @@ test_libudev_sym_LDADD = \
 	libudev.la
 
 $(eval $(value automake2autothing))
+systemd.sed_files += libudev.pc
 AM_CPPFLAGS += $(libbasic.CPPFLAGS)
 AM_CPPFLAGS += $(libsystemd.CPPFLAGS)
 AM_CPPFLAGS += $(libsystemd.CPPFLAGS)