xinput 1.6.3

[xorg-xinput] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a43db58cede59e057c4e34e450b1f628b57cadb4..985207b7f16efb34395a58a2e43d22f63145c147 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,28 +1,34 @@
-# 
-#  Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
-# 
-#  Permission to use, copy, modify, distribute, and sell this software and its
-#  documentation for any purpose is hereby granted without fee, provided that
-#  the above copyright notice appear in all copies and that both that
-#  copyright notice and this permission notice appear in supporting
-#  documentation, and that the name of the author not be used in
-#  advertising or publicity pertaining to distribution of the software without
-#  specific, written prior permission.  The author makes no
-#  representations about the suitability of this software for any purpose.  It
-#  is provided "as is" without express or implied warranty.
-# 
-#  THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-#  PERFORMANCE OF THIS SOFTWARE.
+# Copyright © 2007 Peter Hutterer
+# Copyright © 2009 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.

 
 bin_PROGRAMS = xinput
 
 
 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 transform.c
+endif

 
 xinput_SOURCES = \
     buttonmap.c \
 
 xinput_SOURCES = \
     buttonmap.c \


@@ -32,7 +38,9 @@ xinput_SOURCES = \
     setmode.c \
     setptr.c \
     state.c \
     setmode.c \
     setptr.c \
     state.c \

+    property.c \

     test.c \
     test.c \

-    version.c \

     xinput.c \
     xinput.c \

-    xinput.h
+    xinput.h \
+    $(xinput2_files)
+