X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=1b64b6232ea42b8f9dee7a20050927d954ceb536;hp=dd8b8250045e4d99af60d8f5b8659518e699e51c;hb=7bfd594ac81bed237cd9b98206e22003ddad43e2;hpb=defa8e675b2903ad53e093bb2847c7256f0779a5 diff --git a/Makefile.am b/Makefile.am index dd8b82500..1b64b6232 100644 --- a/Makefile.am +++ b/Makefile.am @@ -231,6 +231,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libsystemd/sd-rtnl \ -I $(top_srcdir)/src/libsystemd/sd-network \ -I $(top_srcdir)/src/libsystemd/sd-hwdb \ + -I $(top_srcdir)/src/libsystemd/sd-device \ -I $(top_srcdir)/src/libsystemd-network \ -I $(top_srcdir)/src/libsystemd-terminal \ $(OUR_CPPFLAGS) @@ -843,8 +844,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/spawn-polkit-agent.h \ src/shared/clock-util.c \ src/shared/clock-util.h \ - src/shared/time-dst.c \ - src/shared/time-dst.h \ src/shared/calendarspec.c \ src/shared/calendarspec.h \ src/shared/fileio.c \ @@ -2145,6 +2144,7 @@ systemd_shutdown_SOURCES = \ systemd_shutdown_LDADD = \ libsystemd-label.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2346,6 +2346,7 @@ systemd_fsck_SOURCES = \ systemd_fsck_LDADD = \ libsystemd-internal.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2381,6 +2382,7 @@ systemd_ac_power_SOURCES = \ systemd_ac_power_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -2652,8 +2654,8 @@ systemd_gpt_auto_generator_SOURCES = \ systemd_gpt_auto_generator_LDADD = \ libsystemd-label.la \ - libsystemd-internal.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) @@ -2805,8 +2807,8 @@ systemd_nspawn_CFLAGS = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ - libsystemd-internal.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) @@ -2920,6 +2922,7 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-path.h \ src/systemd/sd-network.h \ src/systemd/sd-hwdb.h \ + src/systemd/sd-device.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2983,7 +2986,12 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-network/network-util.c \ src/libsystemd/sd-hwdb/sd-hwdb.c \ src/libsystemd/sd-hwdb/hwdb-util.h \ - src/libsystemd/sd-hwdb/hwdb-internal.h + src/libsystemd/sd-hwdb/hwdb-intenal.h \ + src/libsystemd/sd-device/device-internal.h \ + src/libsystemd/sd-device/device-util.h \ + src/libsystemd/sd-device/sd-device.c \ + src/libsystemd/sd-device/device-private.c \ + src/libsystemd/sd-device/device-private.h nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym @@ -3613,10 +3621,12 @@ lib_LTLIBRARIES += \ libudev_la_SOURCES =\ src/libudev/libudev.sym \ src/libudev/libudev-private.h \ + src/libudev/libudev-device-internal.h \ src/libudev/libudev.c \ src/libudev/libudev-list.c \ src/libudev/libudev-util.c \ src/libudev/libudev-device.c \ + src/libudev/libudev-device-private.c \ src/libudev/libudev-enumerate.c \ src/libudev/libudev-monitor.c \ src/libudev/libudev-queue.c \ @@ -3668,8 +3678,7 @@ noinst_LTLIBRARIES += \ libudev-internal.la libudev_internal_la_SOURCES =\ - $(libudev_la_SOURCES) \ - src/libudev/libudev-device-private.c + $(libudev_la_SOURCES) libudev_internal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -3854,9 +3863,9 @@ systemd_hwdb_SOURCES = \ src/hwdb/hwdb.c systemd_hwdb_LDADD = \ + libudev-internal.la \ libsystemd-shared.la \ - libsystemd-internal.la \ - libudev-internal.la + libsystemd-internal.la rootbin_PROGRAMS += \ systemd-hwdb @@ -3877,7 +3886,9 @@ dist_udevhwdb_DATA = \ hwdb/70-touchpad.hwdb EXTRA_DIST += \ - units/systemd-hwdb-update.service.in + units/systemd-hwdb-update.service.in \ + hwdb/ids-update.pl \ + hwdb/sdio.ids SYSINIT_TARGET_WANTS += \ systemd-hwdb-update.service @@ -3964,6 +3975,7 @@ ata_id_SOURCES = \ ata_id_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -3975,6 +3987,7 @@ cdrom_id_SOURCES = \ cdrom_id_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -3989,6 +4002,7 @@ collect_SOURCES = \ collect_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -4003,6 +4017,7 @@ scsi_id_SOURCES =\ scsi_id_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -4017,6 +4032,7 @@ v4l_id_SOURCES = \ v4l_id_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -4031,6 +4047,7 @@ accelerometer_SOURCES = \ accelerometer_LDADD = \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -4930,6 +4947,7 @@ systemd_backlight_SOURCES = \ systemd_backlight_LDADD = \ libsystemd-label.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la endif @@ -4950,6 +4968,7 @@ systemd_rfkill_SOURCES = \ systemd_rfkill_LDADD = \ libsystemd-label.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la endif @@ -4978,6 +4997,7 @@ systemd_cryptsetup_CFLAGS = \ systemd_cryptsetup_LDADD = \ libsystemd-label.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ $(LIBCRYPTSETUP_LIBS) @@ -5273,8 +5293,8 @@ libsystemd_machine_core_la_SOURCES = \ libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ - libsystemd-internal.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la noinst_LTLIBRARIES += \ @@ -5790,8 +5810,8 @@ networkctl_SOURCES = \ src/network/networkctl.c networkctl_LDADD = \ - libsystemd-internal.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la \ libsystemd-network.la @@ -5898,8 +5918,8 @@ libsystemd_logind_core_la_SOURCES = \ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ - libsystemd-internal.la \ libudev-internal.la \ + libsystemd-internal.la \ libsystemd-shared.la if HAVE_ACL @@ -5922,10 +5942,10 @@ loginctl_SOURCES = \ src/login/sysfs-show.c loginctl_LDADD = \ + libudev-internal.la \ libsystemd-internal.la \ libsystemd-logs.la \ libsystemd-journal-internal.la \ - libudev-internal.la \ libsystemd-shared.la rootbin_PROGRAMS += \