X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=04e8e323d53bf91b755dc557766ec837afa216e0;hp=f74982218ff529f00789bda1bb8f565aa00fa4a3;hb=94192cdaf652c9717f15274504ed315126c07a93;hpb=81eca919f7cfa88bad8df7d7eac012f367c4c303

diff --git a/Makefile.am b/Makefile.am
index f74982218..04e8e323d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -646,6 +646,8 @@ test_rtnl_SOURCES = \
 
 test_rtnl_LDADD = \
 	libsystemd-rtnl.la \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
 	libsystemd-shared.la
 
 tests += test-rtnl
@@ -3837,7 +3839,8 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
 	libudev-internal.la \
-	libsystemd-bus.la \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
 	libsystemd-rtnl.la \
 	libsystemd-shared.la
 
@@ -3859,7 +3862,8 @@ test_network_SOURCES = \
 
 test_network_LDADD = \
 	libudev-internal.la \
-	libsystemd-bus.la \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
 	libsystemd-rtnl.la \
 	libsystemd-shared.la
 
@@ -4708,16 +4712,13 @@ check-api-unused: defined undefined exported
 
 define generate-sym-test
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_at)echo '#include <stdio.h>' > $@
-	$(AM_V_at)for file in $(notdir $(filter %.h, $^)); do \
-		echo "#include \"$$file\""; \
-	done >> $@
-	$(AM_V_at)echo 'void* functions[] = {' >> $@
-	$(AM_V_GEN)sed -r -n 's/^( +[a-zA-Z0-9_]+);/\1,/p' $< >> $@
-	$(AM_V_at)echo '};' >> $@
-	$(AM_V_at)echo 'int main(void) {' >> $@
-	$(AM_V_at)echo ' unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%p\n", functions[i]);' >> $@
-	$(AM_V_at)echo 'return 0; }' >> $@
+	$(AM_V_at)printf '#include <stdio.h>\n' > $@
+	$(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+	$(AM_V_at)printf 'void* functions[] = {\n' >> $@
+	$(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+	$(AM_V_at)printf '};\nint main(void) {\n' >> $@
+	$(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
 test-libsystemd-bus-sym.c: \