diff options
Diffstat (limited to 'src/grp-udev')
-rw-r--r-- | src/grp-udev/Makefile | 10 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/Makefile | 9 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/net/Makefile | 1 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-input_id.c | 2 | ||||
-rw-r--r-- | src/grp-udev/libudev-core/udev-builtin-net_setup_link.c | 3 | ||||
-rw-r--r-- | src/grp-udev/mtd_probe/Makefile | 2 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/scsi.h | 1 | ||||
-rw-r--r-- | src/grp-udev/scsi_id/scsi_id.h | 2 | ||||
-rw-r--r-- | src/grp-udev/systemd-hwdb/Makefile | 2 | ||||
-rw-r--r-- | src/grp-udev/systemd-udevd/udevd.c | 1 | ||||
-rw-r--r-- | src/grp-udev/udevadm/Makefile | 2 |
11 files changed, 25 insertions, 10 deletions
diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile index ac635bfdba..e826b46a5c 100644 --- a/src/grp-udev/Makefile +++ b/src/grp-udev/Makefile @@ -43,6 +43,11 @@ dist_udevrules_DATA += \ rules/78-sound-card.rules \ rules/80-net-setup-link.rules +ifneq ($(HAVE_KMOD),) +dist_udevrules_DATA += \ + rules/80-drivers.rules +endif # HAVE_KMOD + nodist_udevrules_DATA += \ rules/99-systemd.rules @@ -70,11 +75,6 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service -ifneq ($(HAVE_KMOD),) -dist_udevrules_DATA += \ - rules/80-drivers.rules -endif # HAVE_KMOD - nested.subdirs += ata_id nested.subdirs += cdrom_id nested.subdirs += collect diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 38c05ffcb1..4323fa96ec 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -38,7 +38,7 @@ $(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf gperf_txt_sources += \ src/udev/keyboard-keys-list.txt -libudev_core_la_SOURCES = \ +_libudev_core_la_SOURCES = \ src/udev/udev.h \ src/udev/udev-event.c \ src/udev/udev-watch.c \ @@ -59,7 +59,7 @@ libudev_core_la_SOURCES = \ src/udev/net/ethtool-util.h \ src/udev/net/ethtool-util.c -nodist_libudev_core_la_SOURCES = \ +_nodist_libudev_core_la_SOURCES = \ src/udev/keyboard-keys-from-name.h \ src/udev/net/link-config-gperf.c @@ -94,6 +94,11 @@ libudev_core_la_SOURCES += \ src/systemd/sd-login.h endif # HAVE_ACL +sd.libudev-core_SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES))) +$(outdir)/libudev-core.la: $(addprefix $(outdir)/,$(sd.libudev-core_SOURCES:.c=.lo)) +$(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + nested.subdirs += net include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index b094ad75cf..5ccbd00002 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -20,6 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. + include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/grp-udev/libudev-core/udev-builtin-input_id.c index 79f45f873c..711ec0b665 100644 --- a/src/grp-udev/libudev-core/udev-builtin-input_id.c +++ b/src/grp-udev/libudev-core/udev-builtin-input_id.c @@ -28,8 +28,8 @@ #include <string.h> #include <unistd.h> -#include <linux/limits.h> #include <linux/input.h> +#include <linux/limits.h> #include "basic/fd-util.h" #include "basic/stdio-util.h" diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c index bf36b42957..3f3522f5e1 100644 --- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c +++ b/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c @@ -19,9 +19,10 @@ #include "basic/alloc-util.h" #include "basic/log.h" -#include "link-config.h" #include "udev.h" +#include "net/link-config.h" + static link_config_ctx *ctx = NULL; static int builtin_net_setup_link(struct udev_device *dev, int argc, char **argv, bool test) { diff --git a/src/grp-udev/mtd_probe/Makefile b/src/grp-udev/mtd_probe/Makefile index d7392a8a3b..50703dddda 100644 --- a/src/grp-udev/mtd_probe/Makefile +++ b/src/grp-udev/mtd_probe/Makefile @@ -34,4 +34,6 @@ dist_udevrules_DATA += \ udevlibexec_PROGRAMS += \ mtd_probe +mtd_probe_LDADD += libbasic.la + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/scsi_id/scsi.h b/src/grp-udev/scsi_id/scsi.h index a27a84a40a..497cfe3e31 100644 --- a/src/grp-udev/scsi_id/scsi.h +++ b/src/grp-udev/scsi_id/scsi.h @@ -13,6 +13,7 @@ */ #include <scsi/scsi.h> +#include <sys/types.h> struct scsi_ioctl_command { unsigned int inlen; /* excluding scsi command length */ diff --git a/src/grp-udev/scsi_id/scsi_id.h b/src/grp-udev/scsi_id/scsi_id.h index 5c2e1c28ee..86d56a0c3f 100644 --- a/src/grp-udev/scsi_id/scsi_id.h +++ b/src/grp-udev/scsi_id/scsi_id.h @@ -17,6 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <libudev.h> + #define MAX_PATH_LEN 512 /* diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile index 2ca5211490..8636cc3270 100644 --- a/src/grp-udev/systemd-hwdb/Makefile +++ b/src/grp-udev/systemd-hwdb/Makefile @@ -74,4 +74,6 @@ EXTRA_DIST += \ hwdb/ids-update.pl \ hwdb/sdio.ids +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/systemd-udevd/udevd.c b/src/grp-udev/systemd-udevd/udevd.c index 23cd4759fc..6ca4069fca 100644 --- a/src/grp-udev/systemd-udevd/udevd.c +++ b/src/grp-udev/systemd-udevd/udevd.c @@ -61,7 +61,6 @@ #include "basic/string-util.h" #include "basic/terminal-util.h" #include "basic/user-util.h" -#include "sd-netlink/netlink-util.h" #include "shared/dev-setup.h" #include "shared/udev-util.h" #include "udev.h" diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile index 1638572ffc..b556d5c9d1 100644 --- a/src/grp-udev/udevadm/Makefile +++ b/src/grp-udev/udevadm/Makefile @@ -43,4 +43,6 @@ udevadm_LDADD = \ libudev-core.la \ libbasic.la +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + include $(topsrcdir)/build-aux/Makefile.tail.mk |