summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-11-17 01:24:49 -0500
committerAnthony G. Basile <blueness@gentoo.org>2012-11-17 01:33:48 -0500
commit98520888b8d267d80c66da9012bd3fe2b34f5004 (patch)
treebf4bb4c7f873ba974ad14d1c2ce6c5154c6fe86b
parent151d9085b438a6c6bb50385c99f3f1969620114b (diff)
src/test: disable for now to get a full build
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am7
-rw-r--r--src/shared/libudev-hwdb-def.h (renamed from src/libudev/libudev-hwdb-def.h)0
-rw-r--r--src/shared/libudev-private.h (renamed from src/libudev/libudev-private.h)0
-rw-r--r--src/shared/libudev.h (renamed from src/libudev/libudev.h)0
-rw-r--r--src/shared/udev.h (renamed from src/udev/udev.h)0
-rw-r--r--src/test/Makefile.am13
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)
-