gudev: remove G_UDEV_API_IS_SUBJECT_TO_CHANGE since API is now stable

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 846152d8712de7be39e92304b562bec3c8b80eec..a6043371cf2d71784c69dddbece3cb6d0b243271 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -335,7 +335,6 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \
        -I$(top_srcdir)/extras/gudev \
        -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
        -D_GUDEV_COMPILATION \
-       -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
        -DG_LOG_DOMAIN=\"GUdev\"
 extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS)
 extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS)
@@ -422,8 +421,8 @@ dist_udevrules_DATA += extras/udev-acl/70-acl.rules
 libexec_PROGRAMS += extras/udev-acl/udev-acl
 
 udevacl-install-hook:
-       mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
-       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
+       mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 
@@ -486,6 +485,7 @@ CLEANFILES += \
 udevkeymapdir = $(libexecdir)/keymaps
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
+       extras/keymap/keymaps/acer-aspire_5720 \
        extras/keymap/keymaps/acer-aspire_5920g \
        extras/keymap/keymaps/acer-aspire_6920 \
        extras/keymap/keymaps/acer-travelmate_c300 \
@@ -510,6 +510,8 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/lenovo-3000 \
        extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
        extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
+       extras/keymap/keymaps/logitech-wave \
+       extras/keymap/keymaps/logitech-wave-cordless \
        extras/keymap/keymaps/maxdata-pro_7000 \
        extras/keymap/keymaps/medion-fid2060 \
        extras/keymap/keymaps/medionnb-a555 \