libudev, systemd-nspawn

5 files changed, 28 insertions, 27 deletions

diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 4c1b794812..6a13a76239 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -132,7 +132,7 @@ libshared_la_CFLAGS = \
 libshared_la_LIBADD = \
 	$(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la \
 	$(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la \
-	libudev-internal.la \
+	$(topoutdir)/src/libudev/src/libudev.la \
 	$(ACL_LIBS) \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index 2531355907..8d9fecb1fb 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -23,20 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-test-libudev-sym.c: \
-		src/libudev/libudev.sym \
-		src/udev/udev.h
-	$(generate-sym-test)
-
-nodist_test_libudev_sym_SOURCES = \
-	test-libudev-sym.c
-test_libudev_sym_CFLAGS = \
-	$(AM_CFLAGS) \
-	-Wno-deprecated-declarations
-test_libudev_sym_LDADD = \
-	libudev.la
-
-$(eval $(value automake2autothing))
 at.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index f56e39da6e..2c31d3efe0 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -50,10 +50,10 @@ libudev_la_SOURCES =\
 libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
-	-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
+	-Wl,--version-script=$(srcdir)/libudev.sym
 
 libudev_la_LIBADD = \
-	libsystemd-internal.la
+	$(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la
 
 pkgconfiglib_DATA += \
 	src/libudev/libudev.pc
@@ -61,8 +61,24 @@ pkgconfiglib_DATA += \
 EXTRA_DIST += \
 	src/libudev/libudev.pc.in
 
+$(outdir)/test-libudev-sym.c: \
+		$(srcdir)/libudev.sym \
+		$(srcdir)/udev.h
+	$(generate-sym-test)
+
+nodist_test_libudev_sym_SOURCES = \
+	test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+	$(AM_CFLAGS) \
+	-Wno-deprecated-declarations
+test_libudev_sym_LDADD = \
+	libudev.la
+
 $(eval $(value automake2autothing))
 AM_CPPFLAGS += $(libbasic.CPPFLAGS)
 AM_CPPFLAGS += $(libsystemd.CPPFLAGS)
+AM_CPPFLAGS += $(libsystemd.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/udev.h b/src/libudev/src/udev.h
index 91dfc950b4..91dfc950b4 100644
--- a/src/udev/udev.h
+++ b/src/libudev/src/udev.h
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 49de89d302..4e163366e2 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -58,24 +58,23 @@ systemd_nspawn_CFLAGS = \
 	$(SECCOMP_CFLAGS)
 
 systemd_nspawn_LDADD = \
-	$(topoutdir)/libshared/libshared.la \
+	$(topoutdir)/src/libshared/libshared.la \
 	$(BLKID_LIBS)
 
 ifneq ($(HAVE_LIBIPTC),)
 systemd_nspawn_LDADD += \
-	$(topoutdir)/libfirewall/libfirewall.la
+	$(topoutdir)/src/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 += $(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
+AM_CPPFLAGS += $(libbasic.CPPFLAGS)
+AM_CPPFLAGS += $(libshared.CPPFLAGS)
+AM_CPPFLAGS += $(libsystemd.CPPFLAGS)
+AM_CPPFLAGS += $(libfirewall.CPPFLAGS)
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink
+AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+AM_CPPFLAGS += -I$(topsrcdir)/src/libudev/src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk