X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4f5e0369901f3b5a636ae03e3ac32b2173651bbf;hp=49ac55fee19c02dec1788599834ffca1ddca6bd3;hb=2ba110900aca729f7d511c185b62149c4a28a293;hpb=65b3903ff576488eaabb51d3c4fbf9c73d867d7c

diff --git a/Makefile.am b/Makefile.am
index 49ac55fee..4f5e03699 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2039,12 +2039,12 @@ nodist_libsystemd_la_SOURCES = \
 
 libsystemd_la_LIBADD = \
 	libsystemd-daemon-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	-lresolv
 
 libsystemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	-pthread \
-	-lresolv
+	-pthread
 
 libsystemd_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -2316,7 +2316,8 @@ test_resolve_SOURCES = \
 
 test_resolve_LDADD = \
 	libsystemd-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	-lresolv
 
 test_resolve_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2344,6 +2345,8 @@ noinst_LTLIBRARIES += \
 libsystemd_dhcp_la_SOURCES = \
 	src/systemd/sd-dhcp-client.h \
 	src/libsystemd-dhcp/sd-dhcp-client.c \
+	src/libsystemd-dhcp/dhcp-lease.h \
+	src/libsystemd-dhcp/dhcp-lease.c \
 	src/libsystemd-dhcp/dhcp-network.c \
 	src/libsystemd-dhcp/dhcp-option.c \
 	src/libsystemd-dhcp/dhcp-internal.h \
@@ -4481,9 +4484,7 @@ libsystemd_id128_la_SOURCES = \
 	src/compat-libs/libsystemd-id128.sym
 
 libsystemd_id128_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	-fvisibility=default \
-	-imacros $(top_srcdir)/src/compat-libs/linkwarning.h
+	$(libsystemd_login_la_CFLAGS)
 
 libsystemd_id128_la_LDFLAGS = \
 	$(AM_LDFLAGS) \