chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timedatectl: port to sd-bus
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 6ce4b7fffa4e52dfb35a4a47891a4b998e247ee0..b2d6358002b407945a38ceaf375bb48a736a6b5b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-83,7
+83,7
@@
userunitdir=$(prefix)/lib/systemd/user
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
-linkdir=$(prefix)/lib/net/links
+networkdir=$(prefix)/lib/systemd/network
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
usergeneratordir=$(prefix)/lib/systemd/user-generators
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
usergeneratordir=$(prefix)/lib/systemd/user-generators
@@
-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/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)
$(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/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
test_rtnl_SOURCES = \
src/libsystemd-rtnl/test-rtnl.c
@@
-1944,6
+1947,8
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-kernel.c \
src/libsystemd-bus/bus-kernel.h \
src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-kernel.c \
src/libsystemd-bus/bus-kernel.h \
+ src/libsystemd-bus/bus-container.c \
+ src/libsystemd-bus/bus-container.h \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
@@
-2214,6
+2219,9
@@
INSTALL_DIRS += \
$(sysconfdir)/udev/rules.d \
$(sysconfdir)/udev/hwdb.d
$(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 \
dist_udevrules_DATA += \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
@@
-2228,8
+2236,7
@@
dist_udevrules_DATA += \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
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/80-net-setup-link.rules \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
@@
-2310,11
+2317,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-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/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
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
@@
-2344,6
+2352,8
@@
libudev_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
+ libsystemd-rtnl.la \
+ libsystemd-id128-internal.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@
-3641,7
+3651,7
@@
timedatectl_CFLAGS = \
timedatectl_LDADD = \
libsystemd-shared.la \
timedatectl_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la
+ libsystemd-bus.la
bin_PROGRAMS += \
timedatectl
bin_PROGRAMS += \
timedatectl
@@
-3684,9
+3694,6
@@
systemd_machined_SOURCES = \
src/machine/machined.c \
src/machine/machined.h
src/machine/machined.c \
src/machine/machined.h
-systemd_machined_CFLAGS = \
- $(libsystemd_machine_core_la_CFLAGS)
-
systemd_machined_LDADD = \
libsystemd-machine-core.la \
$(libsystemd_machine_core_la_LIBADD)
systemd_machined_LDADD = \
libsystemd-machine-core.la \
$(libsystemd_machine_core_la_LIBADD)
@@
-3700,16
+3707,12
@@
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.h \
src/machine/machine-dbus.c
src/machine/machine.h \
src/machine/machine-dbus.c
-libsystemd_machine_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la \
libudev.la
libsystemd-id128-internal.la \
libudev.la
@@
-3725,8
+3728,7
@@
machinectl_CFLAGS = \
machinectl_LDADD = \
libsystemd-shared.la \
machinectl_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
- libudev.la
+ libsystemd-bus.la
rootbin_PROGRAMS += \
machinectl
rootbin_PROGRAMS += \
machinectl
@@
-3734,10
+3736,6
@@
rootbin_PROGRAMS += \
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
-test_machine_tables_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_machine_tables_LDADD = \
libsystemd-machine-core.la
test_machine_tables_LDADD = \
libsystemd-machine-core.la
@@
-4488,8
+4486,8
@@
endif
INSTALL_DIRS += \
$(prefix)/lib/modules-load.d \
$(sysconfdir)/modules-load.d \
INSTALL_DIRS += \
$(prefix)/lib/modules-load.d \
$(sysconfdir)/modules-load.d \
- $(prefix)/lib/
net/links
\
- $(sysconfdir)/
net/links
\
+ $(prefix)/lib/
systemd/network
\
+ $(sysconfdir)/
systemd/network
\
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
$(prefix)/lib/kernel/install.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
$(prefix)/lib/kernel/install.d \