libudev: clarify that udev_monitor_receive_device() is non-blocking

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6cc352ab91a9dd64bc5ba0e7a4b6e36b3cc69f99..77b4aa74eed2e1f9dcaee9bc104a05e66f53e103 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ LIBUDEV_REVISION=1
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=1
+LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
@@ -63,15 +63,15 @@ pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(pkglibexecdir)/user-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
 udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(libexecdir)/udev
-udevrulesdir = $(libexecdir)/udev/rules.d
+udevhomedir = $(udevlibexecdir)
+udevrulesdir = $(udevlibexecdir)/rules.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -132,7 +132,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
-       -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+       -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/shared \
@@ -425,25 +425,6 @@ systemgenerator_PROGRAMS += \
        systemd-rc-local-generator
 endif
 
-if HAVE_PLYMOUTH
-dist_systemunit_DATA += \
-       units/plymouth-start.service \
-       units/plymouth-read-write.service \
-       units/plymouth-quit.service \
-       units/plymouth-quit-wait.service \
-       units/plymouth-reboot.service \
-       units/plymouth-kexec.service \
-       units/plymouth-poweroff.service \
-       units/plymouth-halt.service \
-       units/systemd-ask-password-plymouth.path
-
-nodist_systemunit_DATA += \
-       units/systemd-ask-password-plymouth.service
-
-EXTRA_DIST += \
-       units/systemd-ask-password-plymouth.service.in
-endif
-
 dist_doc_DATA = \
        README \
        NEWS \
@@ -1441,7 +1422,6 @@ MANPAGES += \
 
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-       -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -1922,7 +1902,7 @@ CLEANFILES += \
        src/udev/keymap/keys-from-name.gperf \
        src/udev/keymap/keyboard-force-release.sh
 
-udevkeymapdir = $(libexecdir)/udev/keymaps
+udevkeymapdir = $(udevlibexecdir)/keymaps
 dist_udevkeymap_DATA = \
        keymaps/acer \
        keymaps/acer-aspire_5720 \
@@ -1983,7 +1963,7 @@ dist_udevkeymap_DATA = \
        keymaps/toshiba-satellite_m30x \
        keymaps/zepto-znote
 
-udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
+udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/dell-touchpad \
        keymaps-force-release/dell-xps \
@@ -3007,7 +2987,6 @@ SED_PROCESS = \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
                -e 's,@userunitdir\@,$(userunitdir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
@@ -3020,7 +2999,7 @@ SED_PROCESS = \
                -e 's,@includedir\@,$(includedir),g' \
                -e 's,@VERSION\@,$(VERSION),g' \
                -e 's,@rootprefix\@,$(rootprefix),g' \
-               -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
+               -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
                -e 's,@sushell\@,$(sushell),g' \
                < $< > $@ || rm $@
 
@@ -3249,33 +3228,6 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if HAVE_PLYMOUTH
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/reboot.target.wants \
-               $(DESTDIR)$(systemunitdir)/kexec.target.wants \
-               $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-               $(DESTDIR)$(systemunitdir)/halt.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f plymouth-start.service plymouth-read-write.service && \
-               $(LN_S) ../plymouth-start.service plymouth-start.service && \
-               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service plymouth-quit-wait.service && \
-               $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
-               $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
-       ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
-               rm -f plymouth-reboot.service && \
-               $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
-       ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
-               rm -f plymouth-kexec.service && \
-               $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
-       ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
-               rm -f plymouth-poweroff.service && \
-               $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
-       ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
-               rm -f plymouth-halt.service && \
-               $(LN_S) ../plymouth-halt.service plymouth-halt.service )
-endif
 if TARGET_MEEGO
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \