make: fix issues from non-recursive conversion

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eeef6beadbc213db77a93b81cfbad2098192848b..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 \
@@ -259,6 +278,7 @@ extras_modem_modeswitch_modem_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLA
 extras_modem_modeswitch_modem_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
 
 extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
+extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
 nodist_extras_keymap_keymap_SOURCES = \
        extras/keymap/keys-from-name.h \
        extras/keymap/keys-to-name.h
@@ -311,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 = \
@@ -356,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 \
@@ -373,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
@@ -437,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
@@ -454,6 +468,8 @@ endif # ENABLE_INTROSPECTION
 
 CLEANFILES += $(BUILT_SOURCES)
 
+EXTRA_DIST += $(TESTS)
+
 # ------------------------------------------------------------------------------
 # Install and uninstall hooks
 # ------------------------------------------------------------------------------
@@ -461,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 \
@@ -478,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
 # ------------------------------------------------------------------------------
@@ -489,7 +510,7 @@ extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
 extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
-       $(AM_V_GEN)$(GPERF) -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
+       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
 
 extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
@@ -516,6 +537,7 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
                --nsversion=1.0 \
                --include=GObject-2.0 \
                --library=gudev-1.0 \
+               --library-path=extras/gudev \
                --output $@ \
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \