X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=702513768335585db98d123e8af3b5713dc0fa07;hb=86bbe5bfbc0bf213e9d3fafbe6c64d59b9fc90ea;hp=cc1d42352f239d3b538aa81d00190f3e8d282c6c;hpb=9ff48d0982fcb97923955685fe9fa4e0e67cb238;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index cc1d42352..702513768 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1453,16 +1453,22 @@ test_list_LDADD = \
 
 test_tables_SOURCES = \
 	src/test/test-tables.c \
-	src/shared/test-tables.h
+	src/shared/test-tables.h \
+	src/bus-proxyd/bus-policy.c \
+	src/bus-proxyd/bus-policy.h \
+	src/journal/journald-server.c \
+	src/journal/journald-server.h
 
 test_tables_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(SECCOMP_CFLAGS) \
+	-I$(srcdir)/src/bus-proxyd
 
 test_tables_LDADD = \
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
 	libsystemd-core.la \
+	libudev-core.la \
 	$(RT_LIBS)
 
 test_prioq_SOURCES = \
@@ -3373,16 +3379,6 @@ typelibs_DATA = \
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-hook:
-	libname=libgudev-1.0.so && $(move-to-rootlibdir)
-
-libgudev-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-
-INSTALL_EXEC_HOOKS += libgudev-install-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
 endif
 
 EXTRA_DIST += \
@@ -3531,6 +3527,15 @@ nodist_systemunit_DATA += \
 
 EXTRA_DIST += \
 	units/systemd-journal-upload.service.in
+
+nodist_pkgsysconf_DATA += \
+	src/journal-remote/journal-upload.conf
+
+EXTRA_DIST += \
+	src/journal-remote/journal-upload.conf.in
+
+CLEANFILES += \
+	src/journal-remote/journal-upload.conf
 endif
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
@@ -4785,8 +4790,17 @@ test_network_CFLAGS = \
 test_network_LDADD = \
 	libsystemd-networkd-core.la
 
+test_network_tables_SOURCES = \
+	src/network/test-network-tables.c \
+	src/shared/test-tables.h
+
+test_network_tables_LDADD = \
+	libsystemd-networkd-core.la \
+	libudev-core.la
+
 tests += \
-	test-network
+	test-network \
+	test-network-tables
 
 nodist_systemunit_DATA += \
 	units/systemd-networkd.service \