shared: add process-util.[ch]

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3539e03c5e36b2222ab9cd97313bef271401db38..ceb1d7d565f41806b79ee46938dc09ac99bb0b4e 100644 (file)
--- 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)
@@ -791,6 +792,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/siphash24.c \
        src/shared/siphash24.h \
        src/shared/set.h \
+       src/shared/ordered-set.h \
        src/shared/fdset.c \
        src/shared/fdset.h \
        src/shared/prioq.c \
@@ -843,8 +845,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 \
@@ -899,6 +899,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/base-filesystem.h \
        src/shared/memfd-util.c \
        src/shared/memfd-util.h \
+       src/shared/process-util.c \
+       src/shared/process-util.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
        src/shared/nss-util.h \
@@ -908,7 +910,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sigbus.h \
        src/shared/build.h \
        src/shared/import-util.c \
-       src/shared/import-util.h
+       src/shared/import-util.h \
+       src/shared/sysctl-util.c \
+       src/shared/sysctl-util.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \
@@ -977,6 +981,8 @@ libsystemd_label_la_SOURCES = \
        src/shared/btrfs-util.c \
        src/shared/btrfs-util.h \
        src/shared/btrfs-ctree.h \
+       src/shared/rm-rf.c \
+       src/shared/rm-rf.h \
        src/shared/machine-image.c \
        src/shared/machine-image.h \
        src/shared/machine-pool.c \
@@ -1385,6 +1391,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-process-util \
        test-path-lookup \
        test-ring \
        test-barrier \
@@ -1657,6 +1664,13 @@ test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+test_process_util_SOURCES = \
+       src/test/test-process-util.c
+
+test_process_util_LDADD = \
        libsystemd-shared.la
 
 test_path_lookup_SOURCES = \
@@ -1665,6 +1679,7 @@ test_path_lookup_SOURCES = \
 test_path_lookup_LDADD = \
        -lm \
        libsystemd-units.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 test_uid_range_SOURCES = \
@@ -1964,6 +1979,7 @@ test_path_util_SOURCES = \
        src/test/test-path-util.c
 
 test_path_util_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 test_path_SOURCES = \
@@ -2023,6 +2039,7 @@ test_conf_files_SOURCES = \
        src/test/test-conf-files.c
 
 test_conf_files_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 test_bus_policy_SOURCES = \
@@ -2143,6 +2160,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2344,6 +2362,7 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2379,6 +2398,7 @@ systemd_ac_power_SOURCES = \
 
 systemd_ac_power_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2495,6 +2515,7 @@ bootctl_CFLAGS = \
        $(BLKID_CFLAGS)
 
 bootctl_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-internal.la \
        $(BLKID_LIBS)
@@ -2650,8 +2671,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)
 
@@ -2803,8 +2824,8 @@ systemd_nspawn_CFLAGS = \
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS)
 
@@ -2918,6 +2939,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 \
@@ -2981,7 +3003,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-internal.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
@@ -3611,10 +3638,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 \
@@ -3666,8 +3695,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) \
@@ -3685,21 +3713,20 @@ dist_network_DATA = \
 dist_udevrules_DATA += \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
+       rules/60-block.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
        rules/60-persistent-storage-tape.rules \
-       rules/60-persistent-serial.rules \
        rules/60-persistent-input.rules \
        rules/60-persistent-alsa.rules \
        rules/60-persistent-storage.rules \
+       rules/60-serial.rules \
        rules/64-btrfs.rules \
        rules/70-mouse.rules \
        rules/70-touchpad.rules \
        rules/75-net-description.rules \
-       rules/75-tty-description.rules \
        rules/78-sound-card.rules \
-       rules/80-net-setup-link.rules \
-       rules/95-udev-late.rules
+       rules/80-net-setup-link.rules
 
 nodist_udevrules_DATA += \
        rules/99-systemd.rules
@@ -3853,9 +3880,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
@@ -3876,7 +3903,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
@@ -3963,6 +3992,7 @@ ata_id_SOURCES = \
 
 ata_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -3974,6 +4004,7 @@ cdrom_id_SOURCES = \
 
 cdrom_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -3988,6 +4019,7 @@ collect_SOURCES = \
 
 collect_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4002,6 +4034,7 @@ scsi_id_SOURCES =\
 
 scsi_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4016,6 +4049,7 @@ v4l_id_SOURCES = \
 
 v4l_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4030,6 +4064,7 @@ accelerometer_SOURCES = \
 
 accelerometer_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4929,6 +4964,7 @@ systemd_backlight_SOURCES = \
 systemd_backlight_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -4949,6 +4985,7 @@ systemd_rfkill_SOURCES = \
 systemd_rfkill_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -4977,6 +5014,7 @@ systemd_cryptsetup_CFLAGS = \
 systemd_cryptsetup_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(LIBCRYPTSETUP_LIBS)
 
@@ -5272,8 +5310,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 += \
@@ -5610,7 +5648,7 @@ dist_dbussystemservice_DATA += \
        src/resolve/org.freedesktop.resolve1.service
 
 EXTRA_DIST += \
-       units/systemd-resolved.service.in
+       units/systemd-resolved.service.m4.in
 
 SYSTEM_UNIT_ALIASES += \
        systemd-resolved.service dbus-org.freedesktop.resolve1.service
@@ -5789,8 +5827,8 @@ networkctl_SOURCES = \
        src/network/networkctl.c
 
 networkctl_LDADD = \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        libsystemd-network.la
 
@@ -5897,8 +5935,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
@@ -5921,10 +5959,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 += \