make: fix issues from non-recursive conversion

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 41d45a0127571c4f3d7af30307b0fe3b8e7cb226..bc18fd130f38748b6b5abadb02097070592331d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.am.inc
-
 SUBDIRS = . libudev/docs
 
 udevconfdir = $(sysconfdir)/udev
@@ -9,6 +7,7 @@ dist_udevconf_DATA = \
 EXTRA_DIST = \
        autogen.sh \
        libudev/exported_symbols \
+       extras/keymap/check-keymaps.sh \
        extras/gudev/gudevmarshal.list \
        extras/gudev/gudevenumtypes.h.template \
        extras/gudev/gudevenumtypes.c.template
@@ -22,10 +21,27 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_MAKEFLAGS = --no-print-directory
 
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I$(top_srcdir)/libudev \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DLIBEXECDIR=\""$(libexecdir)"\"
+
+AM_CFLAGS =
+
+AM_LDFLAGS = \
+       -Wl,--as-needed
+
+udevrulesdir = \
+       $(libexecdir)/rules.d
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
        --enable-extras
 
+install-data-local:
+       -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+
 clean-local:
        rm -rf udev-test-install
 
@@ -102,6 +118,9 @@ libudev_libudev_private_la_SOURCES =\
 
 libudev_libudev_private_la_LIBADD =
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libudev/libudev.pc
+
 extras_gudev_libgudev_1_0_la_SOURCES = \
        extras/gudev/gudevenums.h \
        extras/gudev/gudevenumtypes.h \
@@ -312,10 +331,8 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 # Pkg-config, docs and man pages
 # ------------------------------------------------------------------------------
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-       libudev/libudev.pc \
-       udev/udev.pc
+sharepkgconfigdir = $(datadir)/pkgconfig
+sharepkgconfig_DATA = udev/udev.pc
 
 writing_udev_rulesdir = $(docdir)/writing_udev_rules
 dist_writing_udev_rules_DATA = \
@@ -357,7 +374,8 @@ dist_udevrules_DATA += \
        extras/hid2hci/70-hid2hci.rules \
        extras/modem-modeswitch/61-option-modem-modeswitch.rules \
        extras/modem-modeswitch/61-mobile-action.rules \
-       extras/keymap/95-keymap.rules
+       extras/keymap/95-keymap.rules \
+       extras/udev-acl/70-acl.rules
 
 libexec_PROGRAMS += \
        extras/hid2hci/hid2hci \
@@ -374,10 +392,6 @@ BUILT_SOURCES += \
        $(nodist_extras_keymap_keymap_SOURCES) \
        $(dist_extras_gudev_libgudev_1_0_la_SOURCES)
 
-TESTS += extras/keymap/check-keymaps.sh
-
-check_DATA = extras/keymap/keys.txt
-
 CLEANFILES += \
        extras/keymap/keys.txt \
        extras/keymap/keys-from-name.gperf
@@ -438,8 +452,7 @@ libgudev_include_HEADERS = \
 
 pkgconfig_DATA += extras/gudev/gudev-1.0.pc
 
-SUBDIRS += \
-       extras/gudev/docs
+SUBDIRS += extras/gudev/docs
 endif
 
 if ENABLE_INTROSPECTION
@@ -464,6 +477,8 @@ install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
+distcheck-hook: keymaps-distcheck-hook
+
 # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
 libudev-install-move-hook:
        if test "$(libdir)" != "$(rootlib_execdir)"; then \
@@ -481,6 +496,9 @@ 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
 
+keymaps-distcheck-hook: extras/keymap/keys.txt
+       $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
+
 # ------------------------------------------------------------------------------
 # Custom rules
 # ------------------------------------------------------------------------------