X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=0ed33fd0f451660856f4ba401e3bcc628ebfa209;hb=e834047795417b003dbca5a355e8ccdd3148f795;hp=bf5459a7b8fe9e16c7dd555ccf7c732a46e5cc7e;hpb=9dc670ea766c711741f462b29572f2e5f8f3f6bc;p=elogind.git diff --git a/Makefile.am b/Makefile.am index bf5459a7b..0ed33fd0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -183,6 +183,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/udev/net \ -I $(top_builddir)/src/udev \ -I $(top_srcdir)/src/libsystemd-bus \ + -I $(top_srcdir)/src/libsystemd-rtnl \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -627,7 +628,9 @@ libsystemd_rtnl_la_SOURCES = \ src/systemd/sd-rtnl.h \ src/libsystemd-rtnl/sd-rtnl.c \ src/libsystemd-rtnl/rtnl-internal.h \ - src/libsystemd-rtnl/rtnl-message.c + src/libsystemd-rtnl/rtnl-message.c \ + src/libsystemd-rtnl/rtnl-util.h \ + src/libsystemd-rtnl/rtnl-util.c test_rtnl_SOURCES = \ src/libsystemd-rtnl/test-rtnl.c @@ -2312,11 +2315,12 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-keyboard.c \ src/udev/udev-builtin-net_id.c \ - src/udev/udev-builtin-net_link.c \ + src/udev/udev-builtin-net_setup_link.c \ src/udev/udev-builtin-path_id.c \ src/udev/udev-builtin-usb_id.c \ src/udev/net/link-config.h \ src/udev/net/link-config.c \ + src/udev/net/link-config-parse.c \ src/udev/net/ethtool-util.h \ src/udev/net/ethtool-util.c @@ -3705,15 +3709,14 @@ libsystemd_machine_core_la_SOURCES = \ src/machine/machine-dbus.c libsystemd_machine_core_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + $(AM_CFLAGS) libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-audit.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la \ + libsystemd-bus.la \ libsystemd-id128-internal.la \ libudev.la @@ -3739,8 +3742,7 @@ test_machine_tables_SOURCES = \ src/machine/test-machine-tables.c test_machine_tables_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + $(AM_CFLAGS) test_machine_tables_LDADD = \ libsystemd-machine-core.la