diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-07-23 11:11:12 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-07-23 11:12:49 +0930 |
| commit | 5201054d003807ea028aab4318f0bf1eb96e63d2 (patch) | |
| tree | 8e80f2d35ba02633f9f5c8abf8ce3af21a34fc63 | |
| parent | f7866a254b27fc8445eea7711a1a438257b5fab4 (diff) | |
Move synclient and syndaemon into a /tools/ directory.
Let's keep the driver source and the client program source separate.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/Makefile.am | 32 | ||||
| -rw-r--r-- | tools/synclient.c (renamed from src/synclient.c) | 0 | ||||
| -rw-r--r-- | tools/syndaemon.c (renamed from src/syndaemon.c) | 0 |
6 files changed, 37 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 7052905..3e06dc1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,4 +19,4 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign -SUBDIRS = src man +SUBDIRS = src man tools diff --git a/configure.ac b/configure.ac index 8374f72..500e740 100644 --- a/configure.ac +++ b/configure.ac @@ -116,4 +116,7 @@ AC_HEADER_STDC XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION -AC_OUTPUT([Makefile src/Makefile man/Makefile]) +AC_OUTPUT([Makefile + src/Makefile + man/Makefile + tools/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am index 383bb9a..0669326 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,12 +43,3 @@ if BUILD_PSMCOMM psmcomm.c psmcomm.h endif -bin_PROGRAMS = \ - synclient \ - syndaemon - -synclient_SOURCES = synclient.c -synclient_LDFLAGS = -lm - -syndaemon_SOURCES = syndaemon.c -syndaemon_LDFLAGS = -lXi diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..6fc9a4a --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,32 @@ +# Copyright 2008 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 +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL +# ADAM JACKSON 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 = \ + synclient \ + syndaemon + +synclient_INCLUDES = $(top_srcdir)/src/ +syndaemon_INCLUDES = $(top_srcdir)/src/ + +synclient_SOURCES = synclient.c +synclient_LDFLAGS = -lm + +syndaemon_SOURCES = syndaemon.c +syndaemon_LDFLAGS = -lXi diff --git a/src/synclient.c b/tools/synclient.c index f633988..f633988 100644 --- a/src/synclient.c +++ b/tools/synclient.c diff --git a/src/syndaemon.c b/tools/syndaemon.c index ebbeb52..ebbeb52 100644 --- a/src/syndaemon.c +++ b/tools/syndaemon.c |