X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0232e75807e2fd5b0824f77f56db8b65ff5a60a8;hp=365fa548bb034b32f9c6069a556507c9faaeac33;hb=d38cbe1bb7382782226b4b72944c9f7a7cf3eca1;hpb=4c06153f7b7d1af4fc8df4602c1d6714734bf9fd diff --git a/Makefile.am b/Makefile.am index 365fa548b..0232e7580 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2144,6 +2144,9 @@ libsystemd_resolve_la_CFLAGS = \ $(AM_CFLAGS) \ -pthread +libsystemd_resolve_la_LIBADD = \ + -lresolv + noinst_LTLIBRARIES += \ libsystemd-internal.la \ libsystemd-resolve.la @@ -2183,6 +2186,7 @@ nodist_libsystemd_la_SOURCES = \ libsystemd_la_CFLAGS = \ $(libsystemd_internal_la_CFLAGS) \ + $(libsystemd_resolve_la_CFLAGS) \ $(libsystemd_journal_internal_la_CFLAGS) libsystemd_la_LDFLAGS = \ @@ -2192,9 +2196,9 @@ libsystemd_la_LDFLAGS = \ libsystemd_la_LIBADD = \ libsystemd-shared.la \ + $(libsystemd_internal_la_LIBADD) \ $(libsystemd_journal_internal_la_LIBADD) \ - $(RT_LIBS) \ - -lresolv + $(libsystemd_resolve_la_LIBADD) libsystemd-install-hook: libname=libsystemd.so && $(move-to-rootlibdir) @@ -2435,14 +2439,12 @@ test_rtnl_LDADD = \ libsystemd-shared.la test_resolve_SOURCES = \ - src/systemd/sd-resolve.h \ src/libsystemd/sd-resolve/test-resolve.c test_resolve_LDADD = \ - libsystemd-internal.la \ libsystemd-resolve.la \ - libsystemd-shared.la \ - -lresolv + libsystemd-internal.la \ + libsystemd-shared.la test_resolve_CFLAGS = \ $(AM_CFLAGS) \ @@ -4185,8 +4187,10 @@ systemd_networkd_wait_online_SOURCES = \ src/network/networkd-wait-online.h systemd_networkd_wait_online_LDADD = \ + libsystemd-network.la \ + libudev-internal.la \ libsystemd-internal.la \ - libsystemd-network.la + libsystemd-shared.la test_network_SOURCES = \ src/network/test-network.c @@ -5157,7 +5161,8 @@ test-libsystemd-sym.c: \ src/systemd/sd-daemon.h \ src/systemd/sd-login.h \ src/systemd/sd-bus.h \ - src/systemd/sd-utf8.h + src/systemd/sd-utf8.h \ + src/systemd/sd-resolve.h $(generate-sym-test) test-libudev-sym.c: \