diff --git a/tools/Makefile.am b/tools/Makefile.am index 3f69d566..cc1ce194 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,9 +21,7 @@ ptraccel_debug_SOURCES = ptraccel-debug.c ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la ptraccel_debug_LDFLAGS = -no-install -libinput_SOURCES = \ - libinput-tool.c \ - libinput-tool.h +libinput_SOURCES = libinput-tool.c libinput_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) libinput_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) \ -DLIBINPUT_TOOL_PATH="\"@libexecdir@/libinput\"" diff --git a/tools/libinput-debug-events.c b/tools/libinput-debug-events.c index abba707f..25894b1d 100644 --- a/tools/libinput-debug-events.c +++ b/tools/libinput-debug-events.c @@ -39,7 +39,6 @@ #include #include -#include "libinput-tool.h" #include "shared.h" uint32_t start_time; diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c index 9d6c70b8..2e19c010 100755 --- a/tools/libinput-list-devices.c +++ b/tools/libinput-list-devices.c @@ -34,7 +34,6 @@ #include #include -#include "libinput-tool.h" #include "shared.h" static const char * diff --git a/tools/libinput-tool.c b/tools/libinput-tool.c index 3b7c87b6..f37d961e 100644 --- a/tools/libinput-tool.c +++ b/tools/libinput-tool.c @@ -35,10 +35,8 @@ #include #include -#include "libinput-tool.h" - -void -libinput_tool_usage(void) +static void +usage(void) { printf("Usage: libinput [GLOBAL OPTIONS] [COMMAND] [ARGS]\n" "\n" @@ -99,7 +97,7 @@ exec_command(int real_argc, char **real_argv) rc = snprintf(executable, sizeof(executable), "libinput-%s", command); if (rc >= (int)sizeof(executable)) { - libinput_tool_usage(); + usage(); return EXIT_FAILURE; } @@ -137,19 +135,19 @@ main(int argc, char **argv) switch(c) { case 'h': case GOPT_HELP: - libinput_tool_usage(); + usage(); return EXIT_SUCCESS; case GOPT_VERSION: printf("%s\n", LIBINPUT_VERSION); return EXIT_SUCCESS; default: - libinput_tool_usage(); + usage(); return EXIT_FAILURE; } } if (optind >= argc) { - libinput_tool_usage(); + usage(); return EXIT_FAILURE; } diff --git a/tools/libinput-tool.h b/tools/libinput-tool.h deleted file mode 100644 index d7e6f7a5..00000000 --- a/tools/libinput-tool.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright © 2017 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. - */ - -#ifndef LIBINPUT_TOOL_H -#define LIBINPUT_TOOL_H 1 - -#include "config.h" - -#include - -void libinput_tool_usage(void); - -#endif diff --git a/tools/shared.c b/tools/shared.c index fef97477..51246ffd 100644 --- a/tools/shared.c +++ b/tools/shared.c @@ -34,7 +34,6 @@ #include #include -#include "libinput-tool.h" #include "shared.h" enum options { diff --git a/tools/shared.h b/tools/shared.h index 4d6e700e..0fb8c28d 100644 --- a/tools/shared.h +++ b/tools/shared.h @@ -28,8 +28,6 @@ #include -#include "libinput-tool.h" - enum tools_backend { BACKEND_DEVICE, BACKEND_UDEV