X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=0777d01338d9374d7fd6a92aaa3feb4b7f7a98f5;hb=a56b63f41dc779a86573ae77814c14c1db156398;hp=6d1e27b83b1853cc4b89c92e731352b86a048d88;hpb=78628cd27355a157bf44df1cb91f782150a7ca20;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 6d1e27b83..0777d0133 100644 --- a/Makefile.am +++ b/Makefile.am @@ -798,9 +798,6 @@ libsystemd_units_la_SOURCES = \ src/shared/specifier.c \ src/shared/specifier.h -libsystemd_units_la_CFLAGS = \ - $(AM_CFLAGS) - # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-label.la @@ -1563,11 +1560,10 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_TMPFILES systemd_tmpfiles_SOURCES = \ - src/tmpfiles/tmpfiles.c \ - src/shared/specifier.c \ - src/shared/specifier.h + src/tmpfiles/tmpfiles.c systemd_tmpfiles_LDADD = \ + libsystemd-units.la \ libsystemd-label.la \ libsystemd-capability.la \ libsystemd-id128-internal.la \ @@ -2049,7 +2045,7 @@ libsystemd_bus_dump_la_SOURCES = \ src/libsystemd-bus/bus-dump.h libsystemd_bus_dump_la_CFLAGS = \ - $(AM_CFLAGS) + $(AM_CFLAGS) \ $(CAP_CFLAGS) noinst_LTLIBRARIES += \ @@ -3847,23 +3843,40 @@ lib_LTLIBRARIES += \ endif # ------------------------------------------------------------------------------ -test_dhcp_option_SOURCES = \ +libsystemd_dhcp_la_SOURCES = \ + src/systemd/sd-dhcp-client.h \ src/libsystemd-dhcp/dhcp-protocol.h \ src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/dhcp-network.c \ src/libsystemd-dhcp/dhcp-option.c \ + src/libsystemd-dhcp/dhcp-client.c + +noinst_LTLIBRARIES += \ + libsystemd-dhcp.la + +libsystemd_dhcp_la_LIBADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + +test_dhcp_option_SOURCES = \ + src/libsystemd-dhcp/dhcp-protocol.h \ + src/libsystemd-dhcp/dhcp-internal.h \ src/libsystemd-dhcp/test-dhcp-option.c test_dhcp_option_LDADD = \ + libsystemd-dhcp.la \ libsystemd-shared.la test_dhcp_client_SOURCES = \ src/libsystemd-dhcp/dhcp-protocol.h \ src/systemd/sd-dhcp-client.h \ - src/libsystemd-dhcp/dhcp-client.c \ + src/libsystemd-dhcp/dhcp-internal.h \ src/libsystemd-dhcp/test-dhcp-client.c test_dhcp_client_LDADD = \ - libsystemd-shared.la + libsystemd-dhcp.la \ + libsystemd-shared.la \ + libsystemd-bus.la tests += \ test-dhcp-option \