mirror
/
libx52
mirror of https://github.com/nirenjan/libx52.git
1
0
Fork 0
Code Releases Wiki Activity

Use non-recursive Automake

reverse-scroll
nirenjan 2021-07-29 23:53:21 -07:00
parent 23fa0daf4f
commit ac68ee07e5
28 changed files with 285 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Makefile.am
View File

@ -6,29 +6,44 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
# Build any support libraries first
SUBDIRS = lib
if USE_NLS if USE_NLS
po_SUBDIRS = po SUBDIRS += po
endif endif
SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib x52cli x52test evtest daemon tests udev #######################################################################
# Defaults
#######################################################################
bin_PROGRAMS =
check_PROGRAMS =
lib_LTLIBRARIES =
check_LTLIBRARIES =
pkgconfig_DATA =
TESTS =
EXTRA_DIST =
CLEANFILES =
# Extra files that need to be in the distribution x52includedir = $(includedir)/libx52
EXTRA_DIST = \ x52include_HEADERS =
ABOUT-NLS \
AUTHORS \
ChangeLog.md \
CONTRIBUTING.md \
Doxyfile.in \
DoxygenLayout.xml \
INSTALL.md \
LICENSE \
README.md \
config.rpath \
gettext.h \
usb-ids.h \
po/README.md
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
include libx52/Makefile.am
include libx52util/Makefile.am
include libx52io/Makefile.am
include libusbx52/Makefile.am
include cli/Makefile.am
include joytest/Makefile.am
include evtest/Makefile.am
include daemon/Makefile.am
include udev/Makefile.am
#######################################################################
# Doxygen support # Doxygen support
#######################################################################
if HAVE_DOXYGEN if HAVE_DOXYGEN
DXGEN = $(DXGEN_@AM_V@) DXGEN = $(DXGEN_@AM_V@)
DXGEN_ = $(DXGEN_@AM_DEFAULT_V@) DXGEN_ = $(DXGEN_@AM_DEFAULT_V@)
@ -54,3 +69,20 @@ uninstall-local:
rm -rf $(DESTDIR)$(mandir)/man1/x52cli.1 rm -rf $(DESTDIR)$(mandir)/man1/x52cli.1
endif endif
# Extra files that need to be in the distribution
EXTRA_DIST += \
ABOUT-NLS \
AUTHORS \
ChangeLog.md \
CONTRIBUTING.md \
Doxyfile.in \
DoxygenLayout.xml \
INSTALL.md \
LICENSE \
README.md \
config.rpath \
gettext.h \
usb-ids.h \
po/README.md

25
cli/Makefile.am 100644
View File

@ -0,0 +1,25 @@
# Automake for x52cli
#
# Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
#
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
bin_PROGRAMS += x52cli
# Command line utility that front ends the core library
x52cli_SOURCES = cli/x52_cli.c
x52cli_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS)
x52cli_LDFLAGS = $(WARN_LDFLAGS)
x52cli_LDADD = libx52.la
# TODO: Automake doesn't recognize these tests as scripts, and looks for
# C sources. We need to replace these tests with a CMocka test suite
CLI_TESTS = \
cli/cli_test_leds \
cli/cli_test_brightness \
cli/cli_test_indicator \
cli/cli_test_mfd \
cli/cli_test_clock \
cli/cli_test_timezone
EXTRA_DIST += cli/common_infra.sh $(CLI_TESTS)

2
tests/x52cli/test_brightness → cli/cli_test_brightness
View File

@ -5,7 +5,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
source $(dirname $0)/../common_infra.sh source $(dirname $0)/cli/common_infra.sh
TEST_SUITE_ID="libx52 MFD & LED brightness tests" TEST_SUITE_ID="libx52 MFD & LED brightness tests"

2
tests/x52cli/test_clock → cli/cli_test_clock
View File

@ -5,7 +5,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
source $(dirname $0)/../common_infra.sh source $(dirname $0)/cli/common_infra.sh
TEST_SUITE_ID="libx52 clock tests" TEST_SUITE_ID="libx52 clock tests"

2
tests/x52cli/test_indicator → cli/cli_test_indicator
View File

@ -5,7 +5,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
source $(dirname $0)/../common_infra.sh source $(dirname $0)/cli/common_infra.sh
TEST_SUITE_ID="libx52 indicator tests (blink & shift)" TEST_SUITE_ID="libx52 indicator tests (blink & shift)"

2
tests/x52cli/test_leds → cli/cli_test_leds
View File

@ -5,7 +5,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
source $(dirname $0)/../common_infra.sh source $(dirname $0)/cli/common_infra.sh
TEST_SUITE_ID="libx52 LED state tests" TEST_SUITE_ID="libx52 LED state tests"

2
tests/x52cli/test_mfd → cli/cli_test_mfd
View File

@ -5,7 +5,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
source $(dirname $0)/../common_infra.sh source $(dirname $0)/cli/common_infra.sh
TEST_SUITE_ID="libx52 MFD text tests" TEST_SUITE_ID="libx52 MFD text tests"

2
tests/x52cli/test_timezone → cli/cli_test_timezone
View File

@ -5,7 +5,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
source $(dirname $0)/../common_infra.sh source $(dirname $0)/cli/common_infra.sh
require_programs faketime require_programs faketime
TEST_SUITE_ID="libx52 timezone tests" TEST_SUITE_ID="libx52 timezone tests"

6
tests/common_infra.sh → cli/common_infra.sh
View File

@ -79,7 +79,7 @@ find_programs()
fi fi
# Find the X52cli script # Find the X52cli script
X52CLI=$(find .. -path '*/x52cli/x52cli' -perm -+x) X52CLI=$(find .. -path '*/x52cli' -perm -+x)
if [[ -z "$X52CLI" ]] if [[ -z "$X52CLI" ]]
then then
@ -87,14 +87,14 @@ find_programs()
fi fi
# Find the x52test_log_actions program # Find the x52test_log_actions program
X52LOGACT=$(find .. -path '*/libusbx52/x52test_log_actions' -perm -+x) X52LOGACT=$(find .. -path '*/x52test_log_actions' -perm -+x)
if [[ -z "$X52LOGACT" ]] if [[ -z "$X52LOGACT" ]]
then then
exit 1 exit 1
fi fi
# Find the x52test_create_device_list program # Find the x52test_create_device_list program
X52DEVLIST=$(find .. -path '*/libusbx52/x52test_create_device_list' -perm -+x) X52DEVLIST=$(find .. -path '*/x52test_create_device_list' -perm -+x)
if [[ -z "$X52DEVLIST" ]] if [[ -z "$X52DEVLIST" ]]
then then
exit 1 exit 1

0
x52cli/x52_cli.c → cli/x52_cli.c
View File

10
configure.ac
View File

@ -124,18 +124,8 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([ po/Makefile.in AC_CONFIG_FILES([ po/Makefile.in
Makefile Makefile
lib/Makefile lib/Makefile
libx52/Makefile
libx52/libx52.pc libx52/libx52.pc
libusbx52/Makefile
libx52util/Makefile
libx52io/Makefile
lib/pinelog/Makefile lib/pinelog/Makefile
udev/Makefile
udev/60-saitek-x52-x52pro.rules udev/60-saitek-x52-x52pro.rules
x52cli/Makefile
x52test/Makefile
evtest/Makefile
daemon/Makefile
tests/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

33
daemon/Makefile.am
View File

@ -3,15 +3,16 @@
# Copyright (C) 2021 Nirenjan Krishnan (nirenjan@nirenjan.org) # Copyright (C) 2021 Nirenjan Krishnan (nirenjan@nirenjan.org)
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
bin_PROGRAMS += x52d
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = x52d
# Service daemon that manages the X52 device # Service daemon that manages the X52 device
x52d_SOURCES = \ x52d_SOURCES = \
x52d_main.c x52d_config_parser.c x52d_config.c \ daemon/x52d_main.c \
x52d_device.c x52d_clock.c x52d_led.c daemon/x52d_config_parser.c \
daemon/x52d_config.c \
daemon/x52d_device.c \
daemon/x52d_clock.c \
daemon/x52d_led.c
x52d_CFLAGS = \ x52d_CFLAGS = \
-I $(top_srcdir) \ -I $(top_srcdir) \
@ -27,17 +28,17 @@ x52d_CFLAGS = \
x52d_LDFLAGS = @INIH_LIBS@ @PTHREAD_LIBS@ $(WARN_LDFLAGS) x52d_LDFLAGS = @INIH_LIBS@ @PTHREAD_LIBS@ $(WARN_LDFLAGS)
x52d_LDADD = \ x52d_LDADD = \
../lib/pinelog/libpinelog.la \ lib/pinelog/libpinelog.la \
../libx52/libx52.la \ libx52.la \
@LTLIBINTL@ @LTLIBINTL@
x52dconfdir = @sysconfdir@/x52d x52dconfdir = @sysconfdir@/x52d
x52dconf_DATA = x52d.conf x52dconf_DATA = daemon/x52d.conf
EXTRA_DIST = \ EXTRA_DIST += \
x52d_clock.h \ daemon/x52d_clock.h \
x52d_config.def \ daemon/x52d_config.def \
x52d_config.h \ daemon/x52d_config.h \
x52d_const.h \ daemon/x52d_const.h \
x52d_device.h \ daemon/x52d_device.h \
x52d.conf daemon/x52d.conf

8
evtest/Makefile.am
View File

@ -4,12 +4,10 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS += x52evtest
bin_PROGRAMS = x52evtest
# Event test utility that works similarly to the Linux evtest # Event test utility that works similarly to the Linux evtest
x52evtest_SOURCES = ev_test.c x52evtest_SOURCES = evtest/ev_test.c
x52evtest_CFLAGS = -I $(top_srcdir)/libx52io -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS) x52evtest_CFLAGS = -I $(top_srcdir)/libx52io -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS)
x52evtest_LDFLAGS = $(WARN_LDFLAGS) x52evtest_LDFLAGS = $(WARN_LDFLAGS)
x52evtest_LDADD = ../libx52io/libx52io.la x52evtest_LDADD = libx52io.la

14
x52test/Makefile.am → joytest/Makefile.am
View File

@ -4,15 +4,17 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS += x52test
bin_PROGRAMS = x52test
# Test utility that exercises all the library functions # Test utility that exercises all the library functions
x52test_SOURCES = x52_test.c x52_test_mfd.c x52_test_led.c x52_test_clock.c x52test_SOURCES = \
joytest/x52_test.c \
joytest/x52_test_mfd.c \
joytest/x52_test_led.c \
joytest/x52_test_clock.c
x52test_CFLAGS = -I $(top_srcdir)/libx52 -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS) x52test_CFLAGS = -I $(top_srcdir)/libx52 -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS)
x52test_LDFLAGS = $(WARN_LDFLAGS) x52test_LDFLAGS = $(WARN_LDFLAGS)
x52test_LDADD = ../libx52/libx52.la x52test_LDADD = libx52.la
# Extra files that need to be in the distribution # Extra files that need to be in the distribution
EXTRA_DIST = x52_test_common.h EXTRA_DIST += joytest/x52_test_common.h

0
x52test/x52_test.c → joytest/x52_test.c
View File

0
x52test/x52_test_clock.c → joytest/x52_test_clock.c
View File

0
x52test/x52_test_common.h → joytest/x52_test_common.h
View File

0
x52test/x52_test_led.c → joytest/x52_test_led.c
View File

0
x52test/x52_test_mfd.c → joytest/x52_test_mfd.c
View File

25
libusbx52/Makefile.am
View File

@ -4,29 +4,22 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
ACLOCAL_AMFLAGS = -I m4
# Use the pthread compiler variables
LIBS += $(PTHREAD_LIBS)
AM_CFLAGS = $(PTHREAD_CFLAGS)
CC = $(PTHREAD_CC)
# libusb stub library for use by test programs # libusb stub library for use by test programs
check_LTLIBRARIES = libusbx52.la check_LTLIBRARIES += libusbx52.la
libusbx52_la_SOURCES = usb_x52_stub.c fopen_env.c libusbx52_la_SOURCES = libusbx52/usb_x52_stub.c libusbx52/fopen_env.c
libusbx52_la_CFLAGS = @LIBUSB_CFLAGS@ $(WARN_CFLAGS) libusbx52_la_CFLAGS = -I $(top_srcdir)/libusbx52 @LIBUSB_CFLAGS@ $(WARN_CFLAGS)
libusbx52_la_LDFLAGS = -rpath /nowhere -module $(WARN_LDFLAGS) libusbx52_la_LDFLAGS = -rpath /nowhere -module $(WARN_LDFLAGS)
# Utility programs for use by tests # Utility programs for use by tests
check_PROGRAMS = x52test_create_device_list x52test_log_actions check_PROGRAMS += x52test_create_device_list x52test_log_actions
x52test_create_device_list_SOURCES = util/create_device_list.c $(libusbx52_la_SOURCES) x52test_create_device_list_SOURCES = libusbx52/util/create_device_list.c $(libusbx52_la_SOURCES)
x52test_create_device_list_CFLAGS = @LIBUSB_CFLAGS@ $(WARN_CFLAGS) x52test_create_device_list_CFLAGS = $(libusbx52_la_CFLAGS)
x52test_create_device_list_LDFLAGS = $(WARN_LDFLAGS) x52test_create_device_list_LDFLAGS = $(WARN_LDFLAGS)
x52test_log_actions_SOURCES = util/log_actions.c $(libusbx52_la_SOURCES) x52test_log_actions_SOURCES = libusbx52/util/log_actions.c $(libusbx52_la_SOURCES)
x52test_log_actions_CFLAGS = -I $(top_srcdir)/libx52 @LIBUSB_CFLAGS@ $(WARN_CFLAGS) x52test_log_actions_CFLAGS = -I $(top_srcdir)/libx52 $(libusbx52_la_CFLAGS)
x52test_log_actions_LDFLAGS = $(WARN_LDFLAGS) x52test_log_actions_LDFLAGS = $(WARN_LDFLAGS)
EXTRA_DIST = README.md libusbx52.h EXTRA_DIST += libusbx52/README.md libusbx52/libusbx52.h

50
libx52/Makefile.am
View File

@ -4,9 +4,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES += libx52.la
lib_LTLIBRARIES = libx52.la
# Core libx52 library # Core libx52 library
# This library handles the USB communication between the host and the X52 # This library handles the USB communication between the host and the X52
@ -15,9 +13,18 @@ lib_LTLIBRARIES = libx52.la
libx52_v_CUR=6 libx52_v_CUR=6
libx52_v_AGE=4 libx52_v_AGE=4
libx52_v_REV=0 libx52_v_REV=0
libx52_la_SOURCES = x52_control.c x52_core.c x52_date_time.c x52_mfd_led.c \ libx52_la_SOURCES = \
x52_strerror.c x52_stringify.c libx52/x52_control.c \
libx52_la_CFLAGS = @LIBUSB_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -I $(top_srcdir) $(WARN_CFLAGS) libx52/x52_core.c \
libx52/x52_date_time.c \
libx52/x52_mfd_led.c \
libx52/x52_strerror.c \
libx52/x52_stringify.c
libx52_la_CFLAGS = \
@LIBUSB_CFLAGS@ \
-DLOCALEDIR=\"$(localedir)\" \
-I $(top_srcdir) \
$(WARN_CFLAGS)
libx52_la_LDFLAGS = \ libx52_la_LDFLAGS = \
-export-symbols-regex '^libx52_' \ -export-symbols-regex '^libx52_' \
-version-info $(libx52_v_CUR):$(libx52_v_REV):$(libx52_v_AGE) @LIBUSB_LIBS@ \ -version-info $(libx52_v_CUR):$(libx52_v_REV):$(libx52_v_AGE) @LIBUSB_LIBS@ \
@ -25,37 +32,36 @@ libx52_la_LDFLAGS = \
libx52_la_LIBADD = @LTLIBINTL@ libx52_la_LIBADD = @LTLIBINTL@
# Header files that need to be copied # Header files that need to be copied
x52includedir = $(includedir)/libx52 x52include_HEADERS += libx52/libx52.h
x52include_HEADERS = libx52.h
# pkg-config files # pkg-config files
pkgconfig_DATA = libx52.pc pkgconfig_DATA += libx52/libx52.pc
if HAVE_CMOCKA if HAVE_CMOCKA
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh TESTS += libx52test
TESTS = libx52test check_PROGRAMS += libx52test
check_PROGRAMS = libx52test
nodist_libx52test_SOURCES = test_libx52.c nodist_libx52test_SOURCES = libx52/test_libx52.c
libx52test_SOURCES = $(libx52_la_SOURCES) libx52test_SOURCES = $(libx52_la_SOURCES)
libx52test_CFLAGS = @LIBUSB_CFLAGS@ -DLOCALEDIR='"$(localedir)"' -I $(top_srcdir) libx52test_CFLAGS = @LIBUSB_CFLAGS@ -DLOCALEDIR='"$(localedir)"' -I $(top_srcdir) -I $(top_srcdir)/libx52
libx52test_CFLAGS += -Dlibusb_control_transfer=__wrap_libusb_control_transfer libx52test_CFLAGS += -Dlibusb_control_transfer=__wrap_libusb_control_transfer
libx52test_LDFLAGS = @CMOCKA_LIBS@ @LIBUSB_LIBS@ libx52test_LDFLAGS = @CMOCKA_LIBS@ @LIBUSB_LIBS@
libx52test_LDADD = libx52.la libx52test_LDADD = libx52.la
CLEANFILES = test_libx52.c CLEANFILES += libx52/test_libx52.c
test_libx52.c: $(srcdir)/x52_test_gen.py $(srcdir)/x52_tests.json $(builddir)/libx52/test_libx52.c: $(srcdir)/libx52/x52_test_gen.py $(srcdir)/libx52/x52_tests.json
$(AM_V_GEN) $(PYTHON) $(srcdir)/x52_test_gen.py $(srcdir)/x52_tests.json > $@ $(AM_V_GEN) $(PYTHON) $(srcdir)/libx52/x52_test_gen.py $(srcdir)/libx52/x52_tests.json > $@
endif endif
# Extra files that need to be in the distribution # Extra files that need to be in the distribution
EXTRA_DIST = libx52.h x52_commands.h x52_common.h README.md EXTRA_DIST += \
libx52/libx52.h libx52/x52_commands.h libx52/x52_common.h libx52/README.md
# Add test files to the distribution # Add test files to the distribution
EXTRA_DIST += x52_test_gen.py x52_tests.json EXTRA_DIST += libx52/x52_test_gen.py libx52/x52_tests.json
# Add documentation files to the distribution # Add documentation files to the distribution
EXTRA_DIST += \ EXTRA_DIST += \
doc/main.dox \ libx52/doc/main.dox \
doc/caveats.dox \ libx52/doc/caveats.dox \
doc/integration.dox libx52/doc/integration.dox

28
libx52io/Makefile.am
View File

@ -4,7 +4,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
lib_LTLIBRARIES = libx52io.la lib_LTLIBRARIES += libx52io.la
# X52 IO library # X52 IO library
# This library handles the HID parsing of the X52 USB reports # This library handles the HID parsing of the X52 USB reports
@ -13,7 +13,12 @@ lib_LTLIBRARIES = libx52io.la
libx52io_v_CUR=0 libx52io_v_CUR=0
libx52io_v_AGE=0 libx52io_v_AGE=0
libx52io_v_REV=0 libx52io_v_REV=0
libx52io_la_SOURCES = io_core.c io_axis.c io_parser.c io_strings.c io_device.c libx52io_la_SOURCES = \
libx52io/io_core.c \
libx52io/io_axis.c \
libx52io/io_parser.c \
libx52io/io_strings.c \
libx52io/io_device.c
libx52io_la_CFLAGS = @HIDAPI_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -I $(top_srcdir) $(WARN_CFLAGS) libx52io_la_CFLAGS = @HIDAPI_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -I $(top_srcdir) $(WARN_CFLAGS)
libx52io_la_LDFLAGS = \ libx52io_la_LDFLAGS = \
-export-symbols-regex '^libx52io_' \ -export-symbols-regex '^libx52io_' \
@ -22,30 +27,31 @@ libx52io_la_LDFLAGS = \
libx52io_la_LIBADD = @LTLIBINTL@ libx52io_la_LIBADD = @LTLIBINTL@
# Header files that need to be copied # Header files that need to be copied
x52includedir = $(includedir)/libx52 x52include_HEADERS += libx52io/libx52io.h
x52include_HEADERS = libx52io.h
# pkg-config files # pkg-config files
# pkgconfig_DATA = libx52io.pc # pkgconfig_DATA = libx52io.pc
if HAVE_CMOCKA if HAVE_CMOCKA
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh TESTS += test-axis test-parser
TESTS = test-axis test-parser check_PROGRAMS += $(TESTS)
check_PROGRAMS = $(TESTS)
test_axis_SOURCES = test_axis.c $(libx52io_la_SOURCES) test_axis_SOURCES = libx52io/test_axis.c $(libx52io_la_SOURCES)
test_axis_CFLAGS = $(libx52io_la_CFLAGS) test_axis_CFLAGS = $(libx52io_la_CFLAGS)
test_axis_LDFLAGS = @CMOCKA_LIBS@ @HIDAPI_LIBS@ $(WARN_LDFLAGS) test_axis_LDFLAGS = @CMOCKA_LIBS@ @HIDAPI_LIBS@ $(WARN_LDFLAGS)
test_axis_LDADD = @LTLIBINTL@ test_axis_LDADD = @LTLIBINTL@
test_parser_SOURCES = test_parser.c $(libx52io_la_SOURCES) test_parser_SOURCES = libx52io/test_parser.c $(libx52io_la_SOURCES)
test_parser_CFLAGS = $(libx52io_la_CFLAGS) test_parser_CFLAGS = $(libx52io_la_CFLAGS)
test_parser_LDFLAGS = @CMOCKA_LIBS@ @HIDAPI_LIBS@ $(WARN_LDFLAGS) test_parser_LDFLAGS = @CMOCKA_LIBS@ @HIDAPI_LIBS@ $(WARN_LDFLAGS)
test_parser_LDADD = @LTLIBINTL@ test_parser_LDADD = @LTLIBINTL@
# Add a dependency on test_parser_tests.c # Add a dependency on test_parser_tests.c
test_parser.c: test_parser_tests.c libx52io/test_parser.c: libx52io/test_parser_tests.c
endif endif
# Extra files that need to be in the distribution # Extra files that need to be in the distribution
EXTRA_DIST = libx52io.h io_common.h test_parser_tests.c EXTRA_DIST += \
libx52io/libx52io.h \
libx52io/io_common.h \
libx52io/test_parser_tests.c

33
libx52util/Makefile.am
View File

@ -4,28 +4,29 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES += libx52util.la
lib_LTLIBRARIES = libx52util.la
# libx52 utility library # libx52 utility library
# This library provides extra utilities for ease of use # This library provides extra utilities for ease of use
nodist_libx52util_la_SOURCES = util_char_map.c nodist_libx52util_la_SOURCES = libx52util/util_char_map.c
libx52util_la_SOURCES = x52_char_map_lookup.c libx52util_la_SOURCES = libx52util/x52_char_map_lookup.c
libx52util_la_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS) libx52util_la_CFLAGS = -I $(top_srcdir)/libx52util $(WARN_CFLAGS)
libx52util_la_LDFLAGS = -version-info 1:0:0 $(WARN_LDFLAGS) libx52util_la_LDFLAGS = -version-info 1:0:0 $(WARN_LDFLAGS)
# Header files that need to be copied # Header files that need to be copied
x52includedir = $(includedir)/libx52 x52include_HEADERS += libx52util/libx52util.h
x52include_HEADERS = libx52util.h
# Extra files that need to be in the distribution
EXTRA_DIST = x52_char_map.cfg \
x52_char_map.h \
x52_char_map_gen.py
# Autogenerated file that needs to be cleaned up # Autogenerated file that needs to be cleaned up
CLEANFILES = util_char_map.c CLEANFILES += libx52util/util_char_map.c
util_char_map.c: $(srcdir)/x52_char_map.cfg x52_char_map_gen.py util_char_map_c_DEPENDS = \
$(AM_V_GEN) $(PYTHON) $(srcdir)/x52_char_map_gen.py $(srcdir)/x52_char_map.cfg $@ $(srcdir)/libx52util/x52_char_map_gen.py \
$(srcdir)/libx52util/x52_char_map.cfg
$(builddir)/libx52util/util_char_map.c: $(util_char_map_c_DEPENDS)
$(AM_V_GEN) $(PYTHON) $(util_char_map_c_DEPENDS) $@
# Extra files that need to be in the distribution
EXTRA_DIST += libx52util/x52_char_map.cfg \
libx52util/x52_char_map.h \
libx52util/x52_char_map_gen.py

10
po/POTFILES.in
View File

@ -6,11 +6,11 @@ libx52io/io_strings.c
evtest/ev_test.c evtest/ev_test.c
x52test/x52_test.c joytest/x52_test.c
x52test/x52_test_clock.c joytest/x52_test_clock.c
x52test/x52_test_common.h joytest/x52_test_common.h
x52test/x52_test_led.c joytest/x52_test_led.c
x52test/x52_test_mfd.c joytest/x52_test_mfd.c
daemon/x52d_main.c daemon/x52d_main.c
daemon/x52d_clock.c daemon/x52d_clock.c

96
po/x52pro-linux.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: x52pro-linux 0.2.2\n" "Project-Id-Version: x52pro-linux 0.2.2\n"
"Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n" "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
"POT-Creation-Date: 2021-07-29 22:25-0700\n" "POT-Creation-Date: 2021-07-29 22:58-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -255,239 +255,239 @@ msgstr ""
msgid "Event @ %ld.%06ld: %s, value %d\n" msgid "Event @ %ld.%06ld: %s, value %d\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:97 #: joytest/x52_test.c:97
msgid "Test brightness scale (~ 1m)" msgid "Test brightness scale (~ 1m)"
msgstr "" msgstr ""
#: x52test/x52_test.c:98 #: joytest/x52_test.c:98
msgid "Test LED states (~ 45s)" msgid "Test LED states (~ 45s)"
msgstr "" msgstr ""
#: x52test/x52_test.c:99 #: joytest/x52_test.c:99
msgid "Test MFD string display (~ 30s)" msgid "Test MFD string display (~ 30s)"
msgstr "" msgstr ""
#: x52test/x52_test.c:100 #: joytest/x52_test.c:100
msgid "Test MFD displays all characters (~ 2m 15s)" msgid "Test MFD displays all characters (~ 2m 15s)"
msgstr "" msgstr ""
#: x52test/x52_test.c:101 #: joytest/x52_test.c:101
msgid "Test the blink and shift commands (< 10s)" msgid "Test the blink and shift commands (< 10s)"
msgstr "" msgstr ""
#: x52test/x52_test.c:102 #: joytest/x52_test.c:102
msgid "Test the clock commands (~1m)" msgid "Test the clock commands (~1m)"
msgstr "" msgstr ""
#: x52test/x52_test.c:126 #: joytest/x52_test.c:126
msgid "" msgid ""
"x52test is a suite of tests to write to the X52 Pro device\n" "x52test is a suite of tests to write to the X52 Pro device\n"
"and test the extra functionality available in the LEDs and MFD\n" "and test the extra functionality available in the LEDs and MFD\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:130 #: joytest/x52_test.c:130
msgid "These tests take roughly 6 minutes to run" msgid "These tests take roughly 6 minutes to run"
msgstr "" msgstr ""
#: x52test/x52_test.c:132 #: joytest/x52_test.c:132
msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime" msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime"
msgstr "" msgstr ""
#: x52test/x52_test.c:138 #: joytest/x52_test.c:138
#, c-format #, c-format
msgid "Unable to initialize X52 library: %s\n" msgid "Unable to initialize X52 library: %s\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:153 #: joytest/x52_test.c:153
msgid "All tests completed successfully" msgid "All tests completed successfully"
msgstr "" msgstr ""
#: x52test/x52_test.c:155 #: joytest/x52_test.c:155
#, c-format #, c-format
msgid "Got error %s\n" msgid "Got error %s\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:157 #: joytest/x52_test.c:157
#, c-format #, c-format
msgid "Received %s signal, quitting...\n" msgid "Received %s signal, quitting...\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:176 #: joytest/x52_test.c:176
msgid "" msgid ""
"These are the available tests with a description and\n" "These are the available tests with a description and\n"
"approximate runtime. Not specifying any tests will run\n" "approximate runtime. Not specifying any tests will run\n"
"all the tests\n" "all the tests\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:180 #: joytest/x52_test.c:180
msgid "List of tests:" msgid "List of tests:"
msgstr "" msgstr ""
#: x52test/x52_test.c:230 #: joytest/x52_test.c:230
#, c-format #, c-format
msgid "" msgid ""
"Usage: %s [list of tests]\n" "Usage: %s [list of tests]\n"
"\n" "\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:244 #: joytest/x52_test.c:244
#, c-format #, c-format
msgid "" msgid ""
"Unrecognized test identifier: %s\n" "Unrecognized test identifier: %s\n"
"\n" "\n"
msgstr "" msgstr ""
#: x52test/x52_test.c:257 #: joytest/x52_test.c:257
msgid "Not running any tests" msgid "Not running any tests"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:32 #: joytest/x52_test_clock.c:32
msgid "Clock" msgid "Clock"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:33 #: joytest/x52_test_clock.c:33
msgid "This tests the clock display" msgid "This tests the clock display"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:38 #: joytest/x52_test_clock.c:38
msgid "" msgid ""
"\n" "\n"
"Testing clock time minute display for 90 minutes" "Testing clock time minute display for 90 minutes"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:44 #: joytest/x52_test_clock.c:44
msgid "" msgid ""
"\n" "\n"
"Testing clock time hour display for 36 hours, 12 hour mode" "Testing clock time hour display for 36 hours, 12 hour mode"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:47 #: joytest/x52_test_clock.c:47
msgid "" msgid ""
"\n" "\n"
"Testing clock time hour display for 36 hours, 24 hour mode" "Testing clock time hour display for 36 hours, 24 hour mode"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:52 #: joytest/x52_test_clock.c:52
msgid "" msgid ""
"\n" "\n"
"Testing clock date display for 31 days, dd-mm-yy" "Testing clock date display for 31 days, dd-mm-yy"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:56 #: joytest/x52_test_clock.c:56
msgid "" msgid ""
"\n" "\n"
"Testing clock date display for 31 days, mm-dd-yy" "Testing clock date display for 31 days, mm-dd-yy"
msgstr "" msgstr ""
#: x52test/x52_test_clock.c:60 #: joytest/x52_test_clock.c:60
msgid "" msgid ""
"\n" "\n"
"Testing clock date display for 31 days, yy-mm-dd" "Testing clock date display for 31 days, yy-mm-dd"
msgstr "" msgstr ""
#: x52test/x52_test_common.h:26 #: joytest/x52_test_common.h:26
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
"%s(%s) failed with %d(%s)\n" "%s(%s) failed with %d(%s)\n"
msgstr "" msgstr ""
#: x52test/x52_test_common.h:32 #: joytest/x52_test_common.h:32
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
"update failed with %d(%s)\n" "update failed with %d(%s)\n"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:19 #: joytest/x52_test_led.c:19
#, c-format #, c-format
msgid "LED %s - %s\n" msgid "LED %s - %s\n"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:25 x52test/x52_test_led.c:32 #: joytest/x52_test_led.c:25 joytest/x52_test_led.c:32
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
"Testing LED %s\n" "Testing LED %s\n"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:42 #: joytest/x52_test_led.c:42
msgid "LEDs" msgid "LEDs"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:48 #: joytest/x52_test_led.c:48
msgid "Skipping LED tests since the device does not support LED control" msgid "Skipping LED tests since the device does not support LED control"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:55 #: joytest/x52_test_led.c:55
msgid "This cycles the LEDs through all possible states" msgid "This cycles the LEDs through all possible states"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:73 #: joytest/x52_test_led.c:73
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
"Testing %s\n" "Testing %s\n"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:84 #: joytest/x52_test_led.c:84
msgid "Blink & Shift" msgid "Blink & Shift"
msgstr "" msgstr ""
#: x52test/x52_test_led.c:85 #: joytest/x52_test_led.c:85
msgid "This tests the blink indicator and shift functionality" msgid "This tests the blink indicator and shift functionality"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:24 #: joytest/x52_test_mfd.c:24
msgid "Brightness" msgid "Brightness"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:26 #: joytest/x52_test_mfd.c:26
msgid "This test cycles through the MFD and LED brightness scales" msgid "This test cycles through the MFD and LED brightness scales"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:29 #: joytest/x52_test_mfd.c:29
msgid "" msgid ""
"\n" "\n"
"MFD: " "MFD: "
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:36 #: joytest/x52_test_mfd.c:36
msgid "" msgid ""
"\n" "\n"
"LED: " "LED: "
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:55 #: joytest/x52_test_mfd.c:55
msgid "MFD text" msgid "MFD text"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:56 #: joytest/x52_test_mfd.c:56
msgid "This test tests the character displays of the MFD\n" msgid "This test tests the character displays of the MFD\n"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:60 #: joytest/x52_test_mfd.c:60
#, c-format #, c-format
msgid "Writing characters %s\n" msgid "Writing characters %s\n"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:82 #: joytest/x52_test_mfd.c:82
msgid "MFD display" msgid "MFD display"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:83 #: joytest/x52_test_mfd.c:83
msgid "" msgid ""
"This test checks if the display elements can display all characters\n" "This test checks if the display elements can display all characters\n"
"You should see the display cycling through each character, with every\n" "You should see the display cycling through each character, with every\n"
"cell displaying the same character\n" "cell displaying the same character\n"
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:88 #: joytest/x52_test_mfd.c:88
#, c-format #, c-format
msgid "Testing character 0x%02x..." msgid "Testing character 0x%02x..."
msgstr "" msgstr ""
#: x52test/x52_test_mfd.c:96 #: joytest/x52_test_mfd.c:96
msgid "OK" msgid "OK"
msgstr "" msgstr ""

96
po/xx_PL.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: x52pro-linux 0.2.1\n" "Project-Id-Version: x52pro-linux 0.2.1\n"
"Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n" "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
"POT-Creation-Date: 2021-07-29 22:25-0700\n" "POT-Creation-Date: 2021-07-29 22:58-0700\n"
"PO-Revision-Date: 2021-07-27 02:08-0700\n" "PO-Revision-Date: 2021-07-27 02:08-0700\n"
"Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n" "Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n"
"Language-Team: Dummy Language for testing i18n\n" "Language-Team: Dummy Language for testing i18n\n"
@ -255,31 +255,31 @@ msgstr "Estingtay (interruptay otay exitay)\n"
msgid "Event @ %ld.%06ld: %s, value %d\n" msgid "Event @ %ld.%06ld: %s, value %d\n"
msgstr "Eventay @ %ld.%06ld: %s, aluevay %d\n" msgstr "Eventay @ %ld.%06ld: %s, aluevay %d\n"
#: x52test/x52_test.c:97 #: joytest/x52_test.c:97
msgid "Test brightness scale (~ 1m)" msgid "Test brightness scale (~ 1m)"
msgstr "Esttay ightnessbray alescay (~ 1m)" msgstr "Esttay ightnessbray alescay (~ 1m)"
#: x52test/x52_test.c:98 #: joytest/x52_test.c:98
msgid "Test LED states (~ 45s)" msgid "Test LED states (~ 45s)"
msgstr "Esstay EDLay atesstay (~ 45s)" msgstr "Esstay EDLay atesstay (~ 45s)"
#: x52test/x52_test.c:99 #: joytest/x52_test.c:99
msgid "Test MFD string display (~ 30s)" msgid "Test MFD string display (~ 30s)"
msgstr "Esttay MFDay ingstray isplayday (~ 30s)" msgstr "Esttay MFDay ingstray isplayday (~ 30s)"
#: x52test/x52_test.c:100 #: joytest/x52_test.c:100
msgid "Test MFD displays all characters (~ 2m 15s)" msgid "Test MFD displays all characters (~ 2m 15s)"
msgstr "Esttay MFDay isplaysday allay aracterschay (~ 2m 15s)" msgstr "Esttay MFDay isplaysday allay aracterschay (~ 2m 15s)"
#: x52test/x52_test.c:101 #: joytest/x52_test.c:101
msgid "Test the blink and shift commands (< 10s)" msgid "Test the blink and shift commands (< 10s)"
msgstr "Esttay ethay inkblay anday iftshay ommandscay (< 10s)" msgstr "Esttay ethay inkblay anday iftshay ommandscay (< 10s)"
#: x52test/x52_test.c:102 #: joytest/x52_test.c:102
msgid "Test the clock commands (~1m)" msgid "Test the clock commands (~1m)"
msgstr "Esttay ethay ockclay ommandscay (~1m)" msgstr "Esttay ethay ockclay ommandscay (~1m)"
#: x52test/x52_test.c:126 #: joytest/x52_test.c:126
msgid "" msgid ""
"x52test is a suite of tests to write to the X52 Pro device\n" "x52test is a suite of tests to write to the X52 Pro device\n"
"and test the extra functionality available in the LEDs and MFD\n" "and test the extra functionality available in the LEDs and MFD\n"
@ -288,36 +288,36 @@ msgstr ""
"X52 Pro eviceday anday esttay ethay extray unctionalityfay\n" "X52 Pro eviceday anday esttay ethay extray unctionalityfay\n"
"availableay inay ethay EDsLay anday FDMay\n" "availableay inay ethay EDsLay anday FDMay\n"
#: x52test/x52_test.c:130 #: joytest/x52_test.c:130
msgid "These tests take roughly 6 minutes to run" msgid "These tests take roughly 6 minutes to run"
msgstr "Esethay eststay aketay oughlyray 6 inutesmay otay unray" msgstr "Esethay eststay aketay oughlyray 6 inutesmay otay unray"
#: x52test/x52_test.c:132 #: joytest/x52_test.c:132
msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime" msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime"
msgstr "" msgstr ""
"Esspray Enteray otay eginbay ethay eststay, esspray Ctrl-C otay abortay " "Esspray Enteray otay eginbay ethay eststay, esspray Ctrl-C otay abortay "
"anytimeay" "anytimeay"
#: x52test/x52_test.c:138 #: joytest/x52_test.c:138
#, c-format #, c-format
msgid "Unable to initialize X52 library: %s\n" msgid "Unable to initialize X52 library: %s\n"
msgstr "Unableay otay initializeay X52 ibrarylay: %s\n" msgstr "Unableay otay initializeay X52 ibrarylay: %s\n"
#: x52test/x52_test.c:153 #: joytest/x52_test.c:153
msgid "All tests completed successfully" msgid "All tests completed successfully"
msgstr "Allay eststay ompletedcay uccessfullysay" msgstr "Allay eststay ompletedcay uccessfullysay"
#: x52test/x52_test.c:155 #: joytest/x52_test.c:155
#, c-format #, c-format
msgid "Got error %s\n" msgid "Got error %s\n"
msgstr "Otgay erroray %s\n" msgstr "Otgay erroray %s\n"
#: x52test/x52_test.c:157 #: joytest/x52_test.c:157
#, c-format #, c-format
msgid "Received %s signal, quitting...\n" msgid "Received %s signal, quitting...\n"
msgstr "Eceivedray %s ignalsay, uittingqay...\n" msgstr "Eceivedray %s ignalsay, uittingqay...\n"
#: x52test/x52_test.c:176 #: joytest/x52_test.c:176
msgid "" msgid ""
"These are the available tests with a description and\n" "These are the available tests with a description and\n"
"approximate runtime. Not specifying any tests will run\n" "approximate runtime. Not specifying any tests will run\n"
@ -328,18 +328,18 @@ msgstr ""
"ecifyingspay anyay eststay illway unray allay ethay\n" "ecifyingspay anyay eststay illway unray allay ethay\n"
"eststay\n" "eststay\n"
#: x52test/x52_test.c:180 #: joytest/x52_test.c:180
msgid "List of tests:" msgid "List of tests:"
msgstr "Istlay ofay eststay:" msgstr "Istlay ofay eststay:"
#: x52test/x52_test.c:230 #: joytest/x52_test.c:230
#, c-format #, c-format
msgid "" msgid ""
"Usage: %s [list of tests]\n" "Usage: %s [list of tests]\n"
"\n" "\n"
msgstr "Usageay: %s [istlay ofay eststay]\n" msgstr "Usageay: %s [istlay ofay eststay]\n"
#: x52test/x52_test.c:244 #: joytest/x52_test.c:244
#, c-format #, c-format
msgid "" msgid ""
"Unrecognized test identifier: %s\n" "Unrecognized test identifier: %s\n"
@ -348,19 +348,19 @@ msgstr ""
"Unrecognizeday esttay identifieray: %s\n" "Unrecognizeday esttay identifieray: %s\n"
"\n" "\n"
#: x52test/x52_test.c:257 #: joytest/x52_test.c:257
msgid "Not running any tests" msgid "Not running any tests"
msgstr "Otnay unningray anyay eststay" msgstr "Otnay unningray anyay eststay"
#: x52test/x52_test_clock.c:32 #: joytest/x52_test_clock.c:32
msgid "Clock" msgid "Clock"
msgstr "Ockclay" msgstr "Ockclay"
#: x52test/x52_test_clock.c:33 #: joytest/x52_test_clock.c:33
msgid "This tests the clock display" msgid "This tests the clock display"
msgstr "Isthay eststay ethay ockclay isplayday" msgstr "Isthay eststay ethay ockclay isplayday"
#: x52test/x52_test_clock.c:38 #: joytest/x52_test_clock.c:38
msgid "" msgid ""
"\n" "\n"
"Testing clock time minute display for 90 minutes" "Testing clock time minute display for 90 minutes"
@ -368,7 +368,7 @@ msgstr ""
"\n" "\n"
"Estingtay ockclay imetay inutemay isplayday orfay 90 inutesmay" "Estingtay ockclay imetay inutemay isplayday orfay 90 inutesmay"
#: x52test/x52_test_clock.c:44 #: joytest/x52_test_clock.c:44
msgid "" msgid ""
"\n" "\n"
"Testing clock time hour display for 36 hours, 12 hour mode" "Testing clock time hour display for 36 hours, 12 hour mode"
@ -376,7 +376,7 @@ msgstr ""
"\n" "\n"
"Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 12 ourhay odemay" "Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 12 ourhay odemay"
#: x52test/x52_test_clock.c:47 #: joytest/x52_test_clock.c:47
msgid "" msgid ""
"\n" "\n"
"Testing clock time hour display for 36 hours, 24 hour mode" "Testing clock time hour display for 36 hours, 24 hour mode"
@ -384,7 +384,7 @@ msgstr ""
"\n" "\n"
"Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 24 ourhay odemay" "Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 24 ourhay odemay"
#: x52test/x52_test_clock.c:52 #: joytest/x52_test_clock.c:52
msgid "" msgid ""
"\n" "\n"
"Testing clock date display for 31 days, dd-mm-yy" "Testing clock date display for 31 days, dd-mm-yy"
@ -392,7 +392,7 @@ msgstr ""
"\n" "\n"
"Estingtay ockclay ateday isplayday orfay 31 aysday, dd-mm-yy" "Estingtay ockclay ateday isplayday orfay 31 aysday, dd-mm-yy"
#: x52test/x52_test_clock.c:56 #: joytest/x52_test_clock.c:56
msgid "" msgid ""
"\n" "\n"
"Testing clock date display for 31 days, mm-dd-yy" "Testing clock date display for 31 days, mm-dd-yy"
@ -400,7 +400,7 @@ msgstr ""
"\n" "\n"
"Estingtay ockclay ateday isplayday orfay 31 aysday, mm-dd-yy" "Estingtay ockclay ateday isplayday orfay 31 aysday, mm-dd-yy"
#: x52test/x52_test_clock.c:60 #: joytest/x52_test_clock.c:60
msgid "" msgid ""
"\n" "\n"
"Testing clock date display for 31 days, yy-mm-dd" "Testing clock date display for 31 days, yy-mm-dd"
@ -408,7 +408,7 @@ msgstr ""
"\n" "\n"
"Estingtay ockclay ateday isplayday orfay 31 aysday, yy-mm-dd" "Estingtay ockclay ateday isplayday orfay 31 aysday, yy-mm-dd"
#: x52test/x52_test_common.h:26 #: joytest/x52_test_common.h:26
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -417,7 +417,7 @@ msgstr ""
"\n" "\n"
"%s(%s) ailedfay ithway %d(%s)\n" "%s(%s) ailedfay ithway %d(%s)\n"
#: x52test/x52_test_common.h:32 #: joytest/x52_test_common.h:32
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -426,12 +426,12 @@ msgstr ""
"\n" "\n"
"updateay ailedfay ithway %d(%s)\n" "updateay ailedfay ithway %d(%s)\n"
#: x52test/x52_test_led.c:19 #: joytest/x52_test_led.c:19
#, c-format #, c-format
msgid "LED %s - %s\n" msgid "LED %s - %s\n"
msgstr "EDLay %s - %s\n" msgstr "EDLay %s - %s\n"
#: x52test/x52_test_led.c:25 x52test/x52_test_led.c:32 #: joytest/x52_test_led.c:25 joytest/x52_test_led.c:32
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -440,21 +440,21 @@ msgstr ""
"\n" "\n"
"Estingtay EDLay %s\n" "Estingtay EDLay %s\n"
#: x52test/x52_test_led.c:42 #: joytest/x52_test_led.c:42
msgid "LEDs" msgid "LEDs"
msgstr "EDsLay" msgstr "EDsLay"
#: x52test/x52_test_led.c:48 #: joytest/x52_test_led.c:48
msgid "Skipping LED tests since the device does not support LED control" msgid "Skipping LED tests since the device does not support LED control"
msgstr "" msgstr ""
"Ippingskay EDLay eststay incesay ethay eviceday oesday otnay\n" "Ippingskay EDLay eststay incesay ethay eviceday oesday otnay\n"
"upportsay EDLay ontrolcay" "upportsay EDLay ontrolcay"
#: x52test/x52_test_led.c:55 #: joytest/x52_test_led.c:55
msgid "This cycles the LEDs through all possible states" msgid "This cycles the LEDs through all possible states"
msgstr "Isthay yclescay ethay EDsLay oughthray allay ossiblepay tatessay" msgstr "Isthay yclescay ethay EDsLay oughthray allay ossiblepay tatessay"
#: x52test/x52_test_led.c:73 #: joytest/x52_test_led.c:73
#, c-format #, c-format
msgid "" msgid ""
"\n" "\n"
@ -463,25 +463,25 @@ msgstr ""
"\n" "\n"
"Estingtay %s\n" "Estingtay %s\n"
#: x52test/x52_test_led.c:84 #: joytest/x52_test_led.c:84
msgid "Blink & Shift" msgid "Blink & Shift"
msgstr "Inkblay & Iftshay" msgstr "Inkblay & Iftshay"
#: x52test/x52_test_led.c:85 #: joytest/x52_test_led.c:85
msgid "This tests the blink indicator and shift functionality" msgid "This tests the blink indicator and shift functionality"
msgstr "Isthay eststay ethay inkblay indicatoray anday iftshay unctionalityfay" msgstr "Isthay eststay ethay inkblay indicatoray anday iftshay unctionalityfay"
#: x52test/x52_test_mfd.c:24 #: joytest/x52_test_mfd.c:24
msgid "Brightness" msgid "Brightness"
msgstr "Ightnessbray" msgstr "Ightnessbray"
#: x52test/x52_test_mfd.c:26 #: joytest/x52_test_mfd.c:26
msgid "This test cycles through the MFD and LED brightness scales" msgid "This test cycles through the MFD and LED brightness scales"
msgstr "" msgstr ""
"Isthay esttay yclescay oughthray ethay FDMay anday EDLay ightnessbray " "Isthay esttay yclescay oughthray ethay FDMay anday EDLay ightnessbray "
"alesscay" "alesscay"
#: x52test/x52_test_mfd.c:29 #: joytest/x52_test_mfd.c:29
msgid "" msgid ""
"\n" "\n"
"MFD: " "MFD: "
@ -489,7 +489,7 @@ msgstr ""
"\n" "\n"
"FDMay: " "FDMay: "
#: x52test/x52_test_mfd.c:36 #: joytest/x52_test_mfd.c:36
msgid "" msgid ""
"\n" "\n"
"LED: " "LED: "
@ -497,24 +497,24 @@ msgstr ""
"\n" "\n"
"EDLay: " "EDLay: "
#: x52test/x52_test_mfd.c:55 #: joytest/x52_test_mfd.c:55
msgid "MFD text" msgid "MFD text"
msgstr "FDMay exttay" msgstr "FDMay exttay"
#: x52test/x52_test_mfd.c:56 #: joytest/x52_test_mfd.c:56
msgid "This test tests the character displays of the MFD\n" msgid "This test tests the character displays of the MFD\n"
msgstr "Isthay esttay eststay ethay aracterchay isplaysday ofay the FDMay\n" msgstr "Isthay esttay eststay ethay aracterchay isplaysday ofay the FDMay\n"
#: x52test/x52_test_mfd.c:60 #: joytest/x52_test_mfd.c:60
#, c-format #, c-format
msgid "Writing characters %s\n" msgid "Writing characters %s\n"
msgstr "Itingwray aracterschay %s\n" msgstr "Itingwray aracterschay %s\n"
#: x52test/x52_test_mfd.c:82 #: joytest/x52_test_mfd.c:82
msgid "MFD display" msgid "MFD display"
msgstr "FDMay isplayday" msgstr "FDMay isplayday"
#: x52test/x52_test_mfd.c:83 #: joytest/x52_test_mfd.c:83
msgid "" msgid ""
"This test checks if the display elements can display all characters\n" "This test checks if the display elements can display all characters\n"
"You should see the display cycling through each character, with every\n" "You should see the display cycling through each character, with every\n"
@ -525,12 +525,12 @@ msgstr ""
"oughthray eachay aracterchay, ithway everyay ellcay isplayingday ethay\n" "oughthray eachay aracterchay, ithway everyay ellcay isplayingday ethay\n"
"amesay aracterchay\n" "amesay aracterchay\n"
#: x52test/x52_test_mfd.c:88 #: joytest/x52_test_mfd.c:88
#, c-format #, c-format
msgid "Testing character 0x%02x..." msgid "Testing character 0x%02x..."
msgstr "Estingtay aracterchay 0x%02x..." msgstr "Estingtay aracterchay 0x%02x..."
#: x52test/x52_test_mfd.c:96 #: joytest/x52_test_mfd.c:96
msgid "OK" msgid "OK"
msgstr "OKay" msgstr "OKay"

5
udev/Makefile.am
View File

@ -4,8 +4,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
# Extra files that need to be in the distribution EXTRA_DIST += udev/60-saitek-x52-x52pro.rules
EXTRA_DIST = 60-saitek-x52-x52pro.rules
if HAVE_UDEV if HAVE_UDEV
@ -13,7 +12,7 @@ if HAVE_UDEV
# writable by root, and if we're running make distcheck, we're most likely not # writable by root, and if we're running make distcheck, we're most likely not
# running as root. Therefore, disable this if we're running make distcheck # running as root. Therefore, disable this if we're running make distcheck
if !IS_MAKE_DISTCHECK if !IS_MAKE_DISTCHECK
udevrules_DATA = 60-saitek-x52-x52pro.rules udevrules_DATA = udev/60-saitek-x52-x52pro.rules
# Update udev only if being installed by root # Update udev only if being installed by root
install-data-hook: install-data-hook:

15
x52cli/Makefile.am
View File

@ -1,15 +0,0 @@
# Automake for x52cli
#
# Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
#
# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = x52cli
# Command line utility that front ends the core library
x52cli_SOURCES = x52_cli.c
x52cli_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS)
x52cli_LDFLAGS = $(WARN_LDFLAGS)
x52cli_LDADD = ../libx52/libx52.la