extras/keymap: Fix Bluetooth key on Acer Aspire 6920

[elogind.git] / libudev / Makefile.am

diff --git a/libudev/Makefile.am b/libudev/Makefile.am
index 522244641eaa772fa9ccaf443690253a516a1565..6989bf31f31d4eddc52889b2a873c6856e38a00d 100644 (file)
--- a/libudev/Makefile.am
+++ b/libudev/Makefile.am
@@ -12,7 +12,7 @@ test_libudev_SOURCES = \
 test_libudev_LDADD = \
        libudev.la
 
-rootlib_LTLIBRARIES = \
+lib_LTLIBRARIES = \
        libudev.la
 
 include_HEADERS =\
@@ -28,9 +28,24 @@ libudev_la_SOURCES =\
        libudev-monitor.c \
        libudev-queue.c
 
-LT_CURRENT=4
+noinst_LTLIBRARIES = \
+       libudev-private.la
+
+libudev_private_la_SOURCES =\
+       $(libudev_la_SOURCES) \
+       libudev-ctrl.c \
+       libudev-util-private.c \
+       libudev-device-private.c \
+       libudev-queue-private.c
+
+if WITH_SELINUX
+libudev_private_la_SOURCES += \
+       libudev-selinux-private.c
+endif
+
+LT_CURRENT=5
 LT_REVISION=0
-LT_AGE=4
+LT_AGE=5
 libudev_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-symbols $(top_srcdir)/libudev/exported_symbols
@@ -42,17 +57,15 @@ pkgconfig_DATA = \
 EXTRA_DIST = \
        exported_symbols
 
-# move devel files from $(rootlibdir) to $(libdir) if needed
-install-data-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libudev.la
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir); \
-               so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libudev.so); \
-               rm $(DESTDIR)$(rootlibdir)/libudev.so; \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so; \
+# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
+install-exec-hook:
+       if test "$(libdir)" != "$(rootlib_execdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlib_execdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
+               mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
        fi
 
 uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libudev.a
-       rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
+       rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*