tools: make the libinput tool usage static

This now makes the header obsolete too

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3f69d5665459e83650c0f2ed22e47cdee556523d..cc1ce194d36ac9594ba49211b2f4622f911ea8db 100644 (file)
--- 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 abba707f42e6e91f5d62f574b75e3593aac9c706..25894b1df304e65703eb9ef4453f223d6e53ec50 100644 (file)
--- a/tools/libinput-debug-events.c
+++ b/tools/libinput-debug-events.c
@@ -39,7 +39,6 @@
 #include <libinput.h>
 #include <libevdev/libevdev.h>
 
-#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 9d6c70b8b3a8c3bc61455fab9e55816afe8f1894..2e19c010e98e6f2c417142568551dc2521dbed55 100755 (executable)
--- a/tools/libinput-list-devices.c
+++ b/tools/libinput-list-devices.c
@@ -34,7 +34,6 @@
 #include <libinput-util.h>
 #include <libinput-version.h>
 
-#include "libinput-tool.h"
 #include "shared.h"
 
 static const char *

diff --git a/tools/libinput-tool.c b/tools/libinput-tool.c
index 3b7c87b66fc731f1ca4286e1e82975bd8fccb04c..f37d961e184031e5592cd10ae295b9a0ad801a6f 100644 (file)
--- a/tools/libinput-tool.c
+++ b/tools/libinput-tool.c
@@ -35,10 +35,8 @@
 #include <libinput-util.h>
 #include <libinput-version.h>
 
-#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 (file)
index d7e6f7a..0000000
--- 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 <stdbool.h>
-
-void libinput_tool_usage(void);
-
-#endif

diff --git a/tools/shared.c b/tools/shared.c
index fef97477783cc6c98a1c1a326470e3ea84c96fd9..51246ffd0a117e2421d966db02ec917441f61765 100644 (file)
--- a/tools/shared.c
+++ b/tools/shared.c
@@ -34,7 +34,6 @@
 #include <libevdev/libevdev.h>
 #include <libinput-util.h>
 
-#include "libinput-tool.h"
 #include "shared.h"
 
 enum options {

diff --git a/tools/shared.h b/tools/shared.h
index 4d6e700e06ed906c43b096c2c53c81416a6fc984..0fb8c28dd4e92a378b66d06910f705d8c941133c 100644 (file)
--- a/tools/shared.h
+++ b/tools/shared.h
@@ -28,8 +28,6 @@
 
 #include <libinput.h>
 
-#include "libinput-tool.h"
-
 enum tools_backend {
        BACKEND_DEVICE,
        BACKEND_UDEV