Merge in Makefile.am.inc into Makefile.am

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e18c121c24573355a00800008fce217825b26ca9..7d97af51e55d634a756d9b0ebde597e70aefbc8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.am.inc
-
 SUBDIRS = . libudev/docs
 
 udevconfdir = $(sysconfdir)/udev
@@ -22,6 +20,20 @@ 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
@@ -259,6 +271,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
@@ -379,9 +392,7 @@ check_DATA = extras/keymap/keys.txt
 
 CLEANFILES += \
        extras/keymap/keys.txt \
-       extras/keymap/keys-from-name.gperf \
-       extras/keymap/keys-from-name.h \
-       extras/keymap/keys-to-name.h
+       extras/keymap/keys-from-name.gperf
 
 dist_doc_DATA = extras/keymap/README.keymap.txt
 
@@ -454,6 +465,10 @@ EXTRA_DIST += GUdev-1.0.gir
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # ENABLE_INTROSPECTION
 
+CLEANFILES += $(BUILT_SOURCES)
+
+EXTRA_DIST += $(TESTS)
+
 # ------------------------------------------------------------------------------
 # Install and uninstall hooks
 # ------------------------------------------------------------------------------
@@ -489,33 +504,34 @@ 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 "};"}' < $< > $@
 
 extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list
-       glib-genmarshal $< --prefix=g_udev_marshal --header > $@
+       $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
 extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list
-       echo "#include \"gudevmarshal.h\"" > $@ && \
+       $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
        glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
 extras/gudev/gudevenumtypes.h: extras/gudev/gudevenumtypes.h.template extras/gudev/gudevenums.h
-       glib-mkenums --template $^ > \
-           gudevenumtypes.h.tmp && mv gudevenumtypes.h.tmp gudevenumtypes.h
+       $(AM_V_GEN)glib-mkenums --template $^ > \
+           $@.tmp && mv $@.tmp $@
 
 extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h
-       glib-mkenums --template $^ > \
-           gudevenumtypes.c.tmp && mv gudevenumtypes.c.tmp gudevenumtypes.c
+       $(AM_V_GEN)glib-mkenums --template $^ > \
+           $@.tmp && mv $@.tmp $@
 
 extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
-       PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+       $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v \
                --namespace GUdev \
                --nsversion=1.0 \
                --include=GObject-2.0 \
                --library=gudev-1.0 \
+               --library-path=extras/gudev \
                --output $@ \
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \
@@ -532,4 +548,4 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
                $(top_srcdir)/extras/gudev/gudevdevice.c
 
 extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-       g-ir-compiler $< -o $@
+       $(AM_V_GEN)g-ir-compiler $< -o $@