X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0ed33fd0f451660856f4ba401e3bcc628ebfa209;hp=876a7d7ebb5b553ec7037b1c7d8be4f144a92729;hb=e834047795417b003dbca5a355e8ccdd3148f795;hpb=b0770377ab844f92f336837d63f158b954300d2e diff --git a/Makefile.am b/Makefile.am index 876a7d7eb..0ed33fd0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,6 +83,7 @@ userunitdir=$(prefix)/lib/systemd/user userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d +networkdir=$(prefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd systemgeneratordir=$(rootlibexecdir)/system-generators usergeneratordir=$(prefix)/lib/systemd/user-generators @@ -179,8 +180,10 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/core \ -I $(top_srcdir)/src/libudev \ -I $(top_srcdir)/src/udev \ + -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) @@ -617,6 +620,27 @@ EXTRA_DIST += \ make-directive-index.py \ xml_helper.py +# ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-rtnl.la + +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-util.h \ + src/libsystemd-rtnl/rtnl-util.c + +test_rtnl_SOURCES = \ + src/libsystemd-rtnl/test-rtnl.c + +test_rtnl_LDADD = \ + libsystemd-shared.la \ + libsystemd-rtnl.la + +tests += test-rtnl + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-shared.la @@ -1105,6 +1129,7 @@ tests += \ test-utf8 \ test-ellipsize \ test-util \ + test-namespace \ test-date \ test-sleep \ test-replace-var \ @@ -1225,6 +1250,12 @@ test_util_SOURCES = \ test_util_LDADD = \ libsystemd-core.la +test_namespace_SOURCES = \ + src/test/test-namespace.c + +test_namespace_LDADD = \ + libsystemd-core.la + test_hashmap_SOURCES = \ src/test/test-hashmap.c @@ -1442,7 +1473,7 @@ systemd_analyze_CFLAGS = \ systemd_analyze_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la + libsystemd-bus.la # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ @@ -2186,6 +2217,9 @@ INSTALL_DIRS += \ $(sysconfdir)/udev/rules.d \ $(sysconfdir)/udev/hwdb.d +dist_network_DATA = \ + network/99-default.link + dist_udevrules_DATA += \ rules/99-systemd.rules \ rules/42-usb-hid-pm.rules \ @@ -2200,7 +2234,7 @@ dist_udevrules_DATA += \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ - rules/80-net-name-slot.rules \ + rules/85-net-configure-link.rules \ rules/95-udev-late.rules dist_udevhwdb_DATA = \ @@ -2281,19 +2315,30 @@ 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_setup_link.c \ src/udev/udev-builtin-path_id.c \ - src/udev/udev-builtin-usb_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 nodist_libudev_core_la_SOURCES = \ src/udev/keyboard-keys-from-name.h \ - src/udev/keyboard-keys-to-name.h + src/udev/keyboard-keys-to-name.h \ + src/udev/net/link-config-gperf.c BUILT_SOURCES += \ $(nodist_libudev_core_la_SOURCES) CLEANFILES += \ src/udev/keyboard-keys-from-name.gperf \ - src/udev/keyboard-keys.txt + src/udev/keyboard-keys.txt \ + src/udev/net/link-config-gperf.c + +EXTRA_DIST += \ + src/udev/net/link-config-gperf.gperf libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2305,6 +2350,8 @@ libudev_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ + libsystemd-rtnl.la \ + libsystemd-id128-internal.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -3662,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 @@ -3696,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 @@ -3836,7 +3881,7 @@ systemd_inhibit_CFLAGS = \ systemd_inhibit_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la + libsystemd-bus.la rootbin_PROGRAMS += \ systemd-inhibit @@ -4449,6 +4494,8 @@ endif INSTALL_DIRS += \ $(prefix)/lib/modules-load.d \ $(sysconfdir)/modules-load.d \ + $(prefix)/lib/systemd/network \ + $(sysconfdir)/systemd/network \ $(prefix)/lib/sysctl.d \ $(sysconfdir)/sysctl.d \ $(prefix)/lib/kernel/install.d \