7 files changed, 17 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 2c8fddc0b3..df7db241ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,6 +277,6 @@ AC_CONFIG_FILES([Makefile
                  src/gudev/gudev-1.0.pc
                  src/libudev/libudev.pc
                  docs/gudev/version.xml
-                 docs/libudev/version.xml])
-
+                 docs/libudev/version.xml
+                 src/udev/keymap/keyboard-force-release.sh])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index ffed54c9cf..994ef75cc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libudev udev gudev test
+SUBDIRS = \
+	libudev \
+	udev \
+	gudev
+
+# test
diff --git a/src/libudev/libudev-hwdb-def.h b/src/shared/libudev-hwdb-def.h
index e167e2805b..e167e2805b 100644
--- a/src/libudev/libudev-hwdb-def.h
+++ b/src/shared/libudev-hwdb-def.h
diff --git a/src/libudev/libudev-private.h b/src/shared/libudev-private.h
index ff1cc8cefd..ff1cc8cefd 100644
--- a/src/libudev/libudev-private.h
+++ b/src/shared/libudev-private.h
diff --git a/src/libudev/libudev.h b/src/shared/libudev.h
index bb41532a21..bb41532a21 100644
--- a/src/libudev/libudev.h
+++ b/src/shared/libudev.h
diff --git a/src/udev/udev.h b/src/shared/udev.h
index 23a04f766c..23a04f766c 100644
--- a/src/udev/udev.h
+++ b/src/shared/udev.h
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index e1b33fb0ec..8dfb880d56 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -8,12 +8,17 @@ test_libudev_SOURCES = \
 	test-libudev.c
 
 test_libudev_LDADD = \
-	libudev.la
+	$(top_srcdir)/src/libudev/libudev.la
+
+test_libudev_CPPFLAGS = \
+	-I $(top_srcdir)/src/shared
 
 test_udev_SOURCES = \
-	src/test/test-udev.c
+	test-udev.c
+
+test_udev_CPPFLAGS = \
+	-I $(top_srcdir)/src/shared
 
 test_udev_LDADD = \
-	libudev-core.la \
+	$(top_srcdir)/src/udev/libudev-core.la \
 	$(SELINUX_LIBS)
-