Ask gperf to use ANSI-C for generation.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eeef6beadbc213db77a93b81cfbad2098192848b..41d45a0127571c4f3d7af30307b0fe3b8e7cb226 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,6 +259,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
@@ -454,6 +455,8 @@ endif # ENABLE_INTROSPECTION
 
 CLEANFILES += $(BUILT_SOURCES)
 
+EXTRA_DIST += $(TESTS)
+
 # ------------------------------------------------------------------------------
 # Install and uninstall hooks
 # ------------------------------------------------------------------------------
@@ -489,7 +492,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 +519,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 \