Clean up the detection of XI2

[xorg-xinput] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 67fa3a7fc6e5cf283741946cd01f0cacc53488f8..6a747ef72f952bfadd77360058cd216b422f3a13 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,13 +21,17 @@
 
 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
+endif # HAVE_XI2
 
 xinput_SOURCES = \
     buttonmap.c \
     feedback.c \
-    hierarchy.c \
     list.c \
     setint.c \
     setmode.c \
@@ -36,4 +40,6 @@ xinput_SOURCES = \
     test.c \
     version.c \
     xinput.c \
-    xinput.h
+    xinput.h \
+    $(xinput2_files)
+