xinput 1.5.0

[xorg-xinput] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a43db58cede59e057c4e34e450b1f628b57cadb4..ba0d325ac5d5b3c6679b2c7404e28136158b4eca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,8 +21,13 @@
 
 bin_PROGRAMS = xinput
 
-xinput_CFLAGS = $(XINPUT_CFLAGS)
-xinput_LDADD = $(XINPUT_LIBS) -lm
+AM_CFLAGS = $(XINPUT_CFLAGS)
+xinput_LDADD = $(XINPUT_LIBS)
+
+
+if HAVE_XI2
+xinput2_files = hierarchy.c setcp.c test_xi2.c
+endif
 
 xinput_SOURCES = \
     buttonmap.c \
@@ -32,7 +37,9 @@ xinput_SOURCES = \
     setmode.c \
     setptr.c \
     state.c \
+    property.c \
     test.c \
-    version.c \
     xinput.c \
-    xinput.h
+    xinput.h \
+    $(xinput2_files)
+