Move x52cli to top level

Makefile.am

@@ -10,7 +10,7 @@ if USE_NLS
 po_SUBDIRS = po
 endif
 
-SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib utils daemon tests udev
+SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib x52cli utils daemon tests udev
 
 # Extra files that need to be in the distribution
 EXTRA_DIST = \

configure.ac

@@ -133,7 +133,7 @@ AC_CONFIG_FILES([ po/Makefile.in
     udev/Makefile
     udev/60-saitek-x52-x52pro.rules
     utils/Makefile
-    utils/cli/Makefile
+    x52cli/Makefile
     utils/test/Makefile
     utils/evtest/Makefile
     daemon/Makefile

tests/common_infra.sh

@@ -79,7 +79,7 @@ find_programs()
     fi
 
     # Find the X52cli script
-    X52CLI=$(find .. -path '*/cli/x52cli' -perm -+x)
+    X52CLI=$(find .. -path '*/x52cli/x52cli' -perm -+x)
 
     if [[ -z "$X52CLI" ]]
     then

utils/Makefile.am

@@ -4,5 +4,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
 
-SUBDIRS = cli test evtest
+SUBDIRS = test evtest
 

x52cli/Makefile.am

@@ -12,4 +12,4 @@ bin_PROGRAMS = x52cli
 x52cli_SOURCES = x52_cli.c
 x52cli_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS)
 x52cli_LDFLAGS = $(WARN_LDFLAGS)
-x52cli_LDADD = ../../libx52/libx52.la
+x52cli_LDADD = ../libx52/libx52.la