Revert "Do not build extras with --disable-extras"

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 40f13e790ee10238928a9ea809d909f0d302d9c0..2c20f46c6df35cf67ff82e6d51e02ba7a1d28634 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,14 +124,19 @@ sharepkgconfig_DATA = udev/udev.pc
 
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
+       init/udev.socket \
        init/udev.service \
+       init/udev-trigger.service \
        init/udev-settle.service
 
+EXTRA_DIST += init/udev.socket
+
 systemd-install-hook:
+       mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
+       ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev.socket
        mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
        ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
-       ln -sf ../udev-settle.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-settle.service
-       ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-retry.service
+       ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
@@ -220,7 +225,6 @@ dist_udevrules_DATA += \
        extras/rule_generator/75-cd-aliases-generator.rules \
        extras/rule_generator/75-persistent-net-generator.rules
 
-if ENABLE_EXTRAS
 # ------------------------------------------------------------------------------
 # firmware - firmware loading
 # ------------------------------------------------------------------------------
@@ -309,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
-endif # ENABLE_EXTRAS
-
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
 # ------------------------------------------------------------------------------