From ac68ee07e5a1c5115e103ca0673a963969f48861 Mon Sep 17 00:00:00 2001 From: nirenjan Date: Thu, 29 Jul 2021 23:53:21 -0700 Subject: [PATCH] Use non-recursive Automake --- Makefile.am | 66 +++++++++---- cli/Makefile.am | 25 +++++ .../cli_test_brightness | 2 +- tests/x52cli/test_clock => cli/cli_test_clock | 2 +- .../test_indicator => cli/cli_test_indicator | 2 +- tests/x52cli/test_leds => cli/cli_test_leds | 2 +- tests/x52cli/test_mfd => cli/cli_test_mfd | 2 +- .../test_timezone => cli/cli_test_timezone | 2 +- {tests => cli}/common_infra.sh | 6 +- {x52cli => cli}/x52_cli.c | 0 configure.ac | 10 -- daemon/Makefile.am | 33 +++---- evtest/Makefile.am | 8 +- {x52test => joytest}/Makefile.am | 14 +-- {x52test => joytest}/x52_test.c | 0 {x52test => joytest}/x52_test_clock.c | 0 {x52test => joytest}/x52_test_common.h | 0 {x52test => joytest}/x52_test_led.c | 0 {x52test => joytest}/x52_test_mfd.c | 0 libusbx52/Makefile.am | 25 ++--- libx52/Makefile.am | 50 +++++----- libx52io/Makefile.am | 28 +++--- libx52util/Makefile.am | 33 +++---- po/POTFILES.in | 10 +- po/x52pro-linux.pot | 96 +++++++++---------- po/xx_PL.po | 96 +++++++++---------- udev/Makefile.am | 5 +- x52cli/Makefile.am | 15 --- 28 files changed, 285 insertions(+), 247 deletions(-) create mode 100644 cli/Makefile.am rename tests/x52cli/test_brightness => cli/cli_test_brightness (94%) rename tests/x52cli/test_clock => cli/cli_test_clock (99%) rename tests/x52cli/test_indicator => cli/cli_test_indicator (94%) rename tests/x52cli/test_leds => cli/cli_test_leds (97%) rename tests/x52cli/test_mfd => cli/cli_test_mfd (97%) rename tests/x52cli/test_timezone => cli/cli_test_timezone (97%) rename {tests => cli}/common_infra.sh (95%) rename {x52cli => cli}/x52_cli.c (100%) rename {x52test => joytest}/Makefile.am (66%) rename {x52test => joytest}/x52_test.c (100%) rename {x52test => joytest}/x52_test_clock.c (100%) rename {x52test => joytest}/x52_test_common.h (100%) rename {x52test => joytest}/x52_test_led.c (100%) rename {x52test => joytest}/x52_test_mfd.c (100%) delete mode 100644 x52cli/Makefile.am diff --git a/Makefile.am b/Makefile.am index 3f2a154..964852c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,29 +6,44 @@ ACLOCAL_AMFLAGS = -I m4 +# Build any support libraries first +SUBDIRS = lib + if USE_NLS -po_SUBDIRS = po +SUBDIRS += po 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 -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 +x52includedir = $(includedir)/libx52 +x52include_HEADERS = +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 +####################################################################### if HAVE_DOXYGEN DXGEN = $(DXGEN_@AM_V@) DXGEN_ = $(DXGEN_@AM_DEFAULT_V@) @@ -54,3 +69,20 @@ uninstall-local: rm -rf $(DESTDIR)$(mandir)/man1/x52cli.1 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 + diff --git a/cli/Makefile.am b/cli/Makefile.am new file mode 100644 index 0000000..90726e8 --- /dev/null +++ b/cli/Makefile.am @@ -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) diff --git a/tests/x52cli/test_brightness b/cli/cli_test_brightness similarity index 94% rename from tests/x52cli/test_brightness rename to cli/cli_test_brightness index b2d279f..c45d9ff 100755 --- a/tests/x52cli/test_brightness +++ b/cli/cli_test_brightness @@ -5,7 +5,7 @@ # # 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" diff --git a/tests/x52cli/test_clock b/cli/cli_test_clock similarity index 99% rename from tests/x52cli/test_clock rename to cli/cli_test_clock index def836d..abcb9a9 100755 --- a/tests/x52cli/test_clock +++ b/cli/cli_test_clock @@ -5,7 +5,7 @@ # # 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" diff --git a/tests/x52cli/test_indicator b/cli/cli_test_indicator similarity index 94% rename from tests/x52cli/test_indicator rename to cli/cli_test_indicator index 8b4dcbb..3ee2ff0 100755 --- a/tests/x52cli/test_indicator +++ b/cli/cli_test_indicator @@ -5,7 +5,7 @@ # # 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)" diff --git a/tests/x52cli/test_leds b/cli/cli_test_leds similarity index 97% rename from tests/x52cli/test_leds rename to cli/cli_test_leds index 569410c..d89f532 100755 --- a/tests/x52cli/test_leds +++ b/cli/cli_test_leds @@ -5,7 +5,7 @@ # # 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" diff --git a/tests/x52cli/test_mfd b/cli/cli_test_mfd similarity index 97% rename from tests/x52cli/test_mfd rename to cli/cli_test_mfd index 0784080..a1d56ff 100755 --- a/tests/x52cli/test_mfd +++ b/cli/cli_test_mfd @@ -5,7 +5,7 @@ # # 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" diff --git a/tests/x52cli/test_timezone b/cli/cli_test_timezone similarity index 97% rename from tests/x52cli/test_timezone rename to cli/cli_test_timezone index 5c65453..7095a43 100755 --- a/tests/x52cli/test_timezone +++ b/cli/cli_test_timezone @@ -5,7 +5,7 @@ # # 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 TEST_SUITE_ID="libx52 timezone tests" diff --git a/tests/common_infra.sh b/cli/common_infra.sh similarity index 95% rename from tests/common_infra.sh rename to cli/common_infra.sh index 8158d13..b30f008 100644 --- a/tests/common_infra.sh +++ b/cli/common_infra.sh @@ -79,7 +79,7 @@ find_programs() fi # Find the X52cli script - X52CLI=$(find .. -path '*/x52cli/x52cli' -perm -+x) + X52CLI=$(find .. -path '*/x52cli' -perm -+x) if [[ -z "$X52CLI" ]] then @@ -87,14 +87,14 @@ find_programs() fi # 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" ]] then exit 1 fi # 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" ]] then exit 1 diff --git a/x52cli/x52_cli.c b/cli/x52_cli.c similarity index 100% rename from x52cli/x52_cli.c rename to cli/x52_cli.c diff --git a/configure.ac b/configure.ac index fe8ab2a..fa78dad 100644 --- a/configure.ac +++ b/configure.ac @@ -124,18 +124,8 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ po/Makefile.in Makefile lib/Makefile - libx52/Makefile libx52/libx52.pc - libusbx52/Makefile - libx52util/Makefile - libx52io/Makefile lib/pinelog/Makefile - udev/Makefile udev/60-saitek-x52-x52pro.rules - x52cli/Makefile - x52test/Makefile - evtest/Makefile - daemon/Makefile - tests/Makefile ]) AC_OUTPUT diff --git a/daemon/Makefile.am b/daemon/Makefile.am index f26358c..81fa1f4 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -3,15 +3,16 @@ # Copyright (C) 2021 Nirenjan Krishnan (nirenjan@nirenjan.org) # # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 - -ACLOCAL_AMFLAGS = -I m4 - -bin_PROGRAMS = x52d +bin_PROGRAMS += x52d # Service daemon that manages the X52 device x52d_SOURCES = \ - x52d_main.c x52d_config_parser.c x52d_config.c \ - x52d_device.c x52d_clock.c x52d_led.c + daemon/x52d_main.c \ + daemon/x52d_config_parser.c \ + daemon/x52d_config.c \ + daemon/x52d_device.c \ + daemon/x52d_clock.c \ + daemon/x52d_led.c x52d_CFLAGS = \ -I $(top_srcdir) \ @@ -27,17 +28,17 @@ x52d_CFLAGS = \ x52d_LDFLAGS = @INIH_LIBS@ @PTHREAD_LIBS@ $(WARN_LDFLAGS) x52d_LDADD = \ - ../lib/pinelog/libpinelog.la \ - ../libx52/libx52.la \ + lib/pinelog/libpinelog.la \ + libx52.la \ @LTLIBINTL@ x52dconfdir = @sysconfdir@/x52d -x52dconf_DATA = x52d.conf +x52dconf_DATA = daemon/x52d.conf -EXTRA_DIST = \ - x52d_clock.h \ - x52d_config.def \ - x52d_config.h \ - x52d_const.h \ - x52d_device.h \ - x52d.conf +EXTRA_DIST += \ + daemon/x52d_clock.h \ + daemon/x52d_config.def \ + daemon/x52d_config.h \ + daemon/x52d_const.h \ + daemon/x52d_device.h \ + daemon/x52d.conf diff --git a/evtest/Makefile.am b/evtest/Makefile.am index 40df5ec..c5722d2 100644 --- a/evtest/Makefile.am +++ b/evtest/Makefile.am @@ -4,12 +4,10 @@ # # 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 -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_LDFLAGS = $(WARN_LDFLAGS) -x52evtest_LDADD = ../libx52io/libx52io.la +x52evtest_LDADD = libx52io.la diff --git a/x52test/Makefile.am b/joytest/Makefile.am similarity index 66% rename from x52test/Makefile.am rename to joytest/Makefile.am index a11f409..cf87f71 100644 --- a/x52test/Makefile.am +++ b/joytest/Makefile.am @@ -4,15 +4,17 @@ # # 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 -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_LDFLAGS = $(WARN_LDFLAGS) -x52test_LDADD = ../libx52/libx52.la +x52test_LDADD = libx52.la # Extra files that need to be in the distribution -EXTRA_DIST = x52_test_common.h +EXTRA_DIST += joytest/x52_test_common.h diff --git a/x52test/x52_test.c b/joytest/x52_test.c similarity index 100% rename from x52test/x52_test.c rename to joytest/x52_test.c diff --git a/x52test/x52_test_clock.c b/joytest/x52_test_clock.c similarity index 100% rename from x52test/x52_test_clock.c rename to joytest/x52_test_clock.c diff --git a/x52test/x52_test_common.h b/joytest/x52_test_common.h similarity index 100% rename from x52test/x52_test_common.h rename to joytest/x52_test_common.h diff --git a/x52test/x52_test_led.c b/joytest/x52_test_led.c similarity index 100% rename from x52test/x52_test_led.c rename to joytest/x52_test_led.c diff --git a/x52test/x52_test_mfd.c b/joytest/x52_test_mfd.c similarity index 100% rename from x52test/x52_test_mfd.c rename to joytest/x52_test_mfd.c diff --git a/libusbx52/Makefile.am b/libusbx52/Makefile.am index 4fdb6f7..1f82b6f 100644 --- a/libusbx52/Makefile.am +++ b/libusbx52/Makefile.am @@ -4,29 +4,22 @@ # # 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 -check_LTLIBRARIES = libusbx52.la +check_LTLIBRARIES += libusbx52.la -libusbx52_la_SOURCES = usb_x52_stub.c fopen_env.c -libusbx52_la_CFLAGS = @LIBUSB_CFLAGS@ $(WARN_CFLAGS) +libusbx52_la_SOURCES = libusbx52/usb_x52_stub.c libusbx52/fopen_env.c +libusbx52_la_CFLAGS = -I $(top_srcdir)/libusbx52 @LIBUSB_CFLAGS@ $(WARN_CFLAGS) libusbx52_la_LDFLAGS = -rpath /nowhere -module $(WARN_LDFLAGS) # 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_CFLAGS = @LIBUSB_CFLAGS@ $(WARN_CFLAGS) +x52test_create_device_list_SOURCES = libusbx52/util/create_device_list.c $(libusbx52_la_SOURCES) +x52test_create_device_list_CFLAGS = $(libusbx52_la_CFLAGS) x52test_create_device_list_LDFLAGS = $(WARN_LDFLAGS) -x52test_log_actions_SOURCES = util/log_actions.c $(libusbx52_la_SOURCES) -x52test_log_actions_CFLAGS = -I $(top_srcdir)/libx52 @LIBUSB_CFLAGS@ $(WARN_CFLAGS) +x52test_log_actions_SOURCES = libusbx52/util/log_actions.c $(libusbx52_la_SOURCES) +x52test_log_actions_CFLAGS = -I $(top_srcdir)/libx52 $(libusbx52_la_CFLAGS) x52test_log_actions_LDFLAGS = $(WARN_LDFLAGS) -EXTRA_DIST = README.md libusbx52.h +EXTRA_DIST += libusbx52/README.md libusbx52/libusbx52.h diff --git a/libx52/Makefile.am b/libx52/Makefile.am index 1d9e83e..3166c68 100644 --- a/libx52/Makefile.am +++ b/libx52/Makefile.am @@ -4,9 +4,7 @@ # # 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 # 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_AGE=4 libx52_v_REV=0 -libx52_la_SOURCES = x52_control.c x52_core.c x52_date_time.c x52_mfd_led.c \ - x52_strerror.c x52_stringify.c -libx52_la_CFLAGS = @LIBUSB_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -I $(top_srcdir) $(WARN_CFLAGS) +libx52_la_SOURCES = \ + libx52/x52_control.c \ + 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 = \ -export-symbols-regex '^libx52_' \ -version-info $(libx52_v_CUR):$(libx52_v_REV):$(libx52_v_AGE) @LIBUSB_LIBS@ \ @@ -25,37 +32,36 @@ libx52_la_LDFLAGS = \ libx52_la_LIBADD = @LTLIBINTL@ # Header files that need to be copied -x52includedir = $(includedir)/libx52 -x52include_HEADERS = libx52.h +x52include_HEADERS += libx52/libx52.h # pkg-config files -pkgconfig_DATA = libx52.pc +pkgconfig_DATA += libx52/libx52.pc if HAVE_CMOCKA -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh -TESTS = libx52test -check_PROGRAMS = libx52test +TESTS += libx52test +check_PROGRAMS += libx52test -nodist_libx52test_SOURCES = test_libx52.c +nodist_libx52test_SOURCES = libx52/test_libx52.c 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_LDFLAGS = @CMOCKA_LIBS@ @LIBUSB_LIBS@ libx52test_LDADD = libx52.la -CLEANFILES = test_libx52.c -test_libx52.c: $(srcdir)/x52_test_gen.py $(srcdir)/x52_tests.json - $(AM_V_GEN) $(PYTHON) $(srcdir)/x52_test_gen.py $(srcdir)/x52_tests.json > $@ +CLEANFILES += libx52/test_libx52.c +$(builddir)/libx52/test_libx52.c: $(srcdir)/libx52/x52_test_gen.py $(srcdir)/libx52/x52_tests.json + $(AM_V_GEN) $(PYTHON) $(srcdir)/libx52/x52_test_gen.py $(srcdir)/libx52/x52_tests.json > $@ endif # 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 -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 EXTRA_DIST += \ - doc/main.dox \ - doc/caveats.dox \ - doc/integration.dox + libx52/doc/main.dox \ + libx52/doc/caveats.dox \ + libx52/doc/integration.dox diff --git a/libx52io/Makefile.am b/libx52io/Makefile.am index 9fb534e..c3168ce 100644 --- a/libx52io/Makefile.am +++ b/libx52io/Makefile.am @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 -lib_LTLIBRARIES = libx52io.la +lib_LTLIBRARIES += libx52io.la # X52 IO library # 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_AGE=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_LDFLAGS = \ -export-symbols-regex '^libx52io_' \ @@ -22,30 +27,31 @@ libx52io_la_LDFLAGS = \ libx52io_la_LIBADD = @LTLIBINTL@ # Header files that need to be copied -x52includedir = $(includedir)/libx52 -x52include_HEADERS = libx52io.h +x52include_HEADERS += libx52io/libx52io.h # pkg-config files # pkgconfig_DATA = libx52io.pc if HAVE_CMOCKA -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh -TESTS = test-axis test-parser -check_PROGRAMS = $(TESTS) +TESTS += test-axis test-parser +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_LDFLAGS = @CMOCKA_LIBS@ @HIDAPI_LIBS@ $(WARN_LDFLAGS) 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_LDFLAGS = @CMOCKA_LIBS@ @HIDAPI_LIBS@ $(WARN_LDFLAGS) test_parser_LDADD = @LTLIBINTL@ # 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 # 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 diff --git a/libx52util/Makefile.am b/libx52util/Makefile.am index 63d9bf2..a7864bb 100644 --- a/libx52util/Makefile.am +++ b/libx52util/Makefile.am @@ -4,28 +4,29 @@ # # 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 # This library provides extra utilities for ease of use -nodist_libx52util_la_SOURCES = util_char_map.c -libx52util_la_SOURCES = x52_char_map_lookup.c -libx52util_la_CFLAGS = -I $(top_srcdir)/libx52 $(WARN_CFLAGS) +nodist_libx52util_la_SOURCES = libx52util/util_char_map.c +libx52util_la_SOURCES = libx52util/x52_char_map_lookup.c +libx52util_la_CFLAGS = -I $(top_srcdir)/libx52util $(WARN_CFLAGS) libx52util_la_LDFLAGS = -version-info 1:0:0 $(WARN_LDFLAGS) # Header files that need to be copied -x52includedir = $(includedir)/libx52 -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 +x52include_HEADERS += libx52util/libx52util.h # Autogenerated file that needs to be cleaned up -CLEANFILES = util_char_map.c -util_char_map.c: $(srcdir)/x52_char_map.cfg x52_char_map_gen.py - $(AM_V_GEN) $(PYTHON) $(srcdir)/x52_char_map_gen.py $(srcdir)/x52_char_map.cfg $@ +CLEANFILES += libx52util/util_char_map.c +util_char_map_c_DEPENDS = \ + $(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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 9bab045..4a869a0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,11 +6,11 @@ libx52io/io_strings.c evtest/ev_test.c -x52test/x52_test.c -x52test/x52_test_clock.c -x52test/x52_test_common.h -x52test/x52_test_led.c -x52test/x52_test_mfd.c +joytest/x52_test.c +joytest/x52_test_clock.c +joytest/x52_test_common.h +joytest/x52_test_led.c +joytest/x52_test_mfd.c daemon/x52d_main.c daemon/x52d_clock.c diff --git a/po/x52pro-linux.pot b/po/x52pro-linux.pot index 208fccf..301bfd0 100644 --- a/po/x52pro-linux.pot +++ b/po/x52pro-linux.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: x52pro-linux 0.2.2\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -255,239 +255,239 @@ msgstr "" msgid "Event @ %ld.%06ld: %s, value %d\n" msgstr "" -#: x52test/x52_test.c:97 +#: joytest/x52_test.c:97 msgid "Test brightness scale (~ 1m)" msgstr "" -#: x52test/x52_test.c:98 +#: joytest/x52_test.c:98 msgid "Test LED states (~ 45s)" msgstr "" -#: x52test/x52_test.c:99 +#: joytest/x52_test.c:99 msgid "Test MFD string display (~ 30s)" msgstr "" -#: x52test/x52_test.c:100 +#: joytest/x52_test.c:100 msgid "Test MFD displays all characters (~ 2m 15s)" msgstr "" -#: x52test/x52_test.c:101 +#: joytest/x52_test.c:101 msgid "Test the blink and shift commands (< 10s)" msgstr "" -#: x52test/x52_test.c:102 +#: joytest/x52_test.c:102 msgid "Test the clock commands (~1m)" msgstr "" -#: x52test/x52_test.c:126 +#: joytest/x52_test.c:126 msgid "" "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" msgstr "" -#: x52test/x52_test.c:130 +#: joytest/x52_test.c:130 msgid "These tests take roughly 6 minutes to run" msgstr "" -#: x52test/x52_test.c:132 +#: joytest/x52_test.c:132 msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime" msgstr "" -#: x52test/x52_test.c:138 +#: joytest/x52_test.c:138 #, c-format msgid "Unable to initialize X52 library: %s\n" msgstr "" -#: x52test/x52_test.c:153 +#: joytest/x52_test.c:153 msgid "All tests completed successfully" msgstr "" -#: x52test/x52_test.c:155 +#: joytest/x52_test.c:155 #, c-format msgid "Got error %s\n" msgstr "" -#: x52test/x52_test.c:157 +#: joytest/x52_test.c:157 #, c-format msgid "Received %s signal, quitting...\n" msgstr "" -#: x52test/x52_test.c:176 +#: joytest/x52_test.c:176 msgid "" "These are the available tests with a description and\n" "approximate runtime. Not specifying any tests will run\n" "all the tests\n" msgstr "" -#: x52test/x52_test.c:180 +#: joytest/x52_test.c:180 msgid "List of tests:" msgstr "" -#: x52test/x52_test.c:230 +#: joytest/x52_test.c:230 #, c-format msgid "" "Usage: %s [list of tests]\n" "\n" msgstr "" -#: x52test/x52_test.c:244 +#: joytest/x52_test.c:244 #, c-format msgid "" "Unrecognized test identifier: %s\n" "\n" msgstr "" -#: x52test/x52_test.c:257 +#: joytest/x52_test.c:257 msgid "Not running any tests" msgstr "" -#: x52test/x52_test_clock.c:32 +#: joytest/x52_test_clock.c:32 msgid "Clock" msgstr "" -#: x52test/x52_test_clock.c:33 +#: joytest/x52_test_clock.c:33 msgid "This tests the clock display" msgstr "" -#: x52test/x52_test_clock.c:38 +#: joytest/x52_test_clock.c:38 msgid "" "\n" "Testing clock time minute display for 90 minutes" msgstr "" -#: x52test/x52_test_clock.c:44 +#: joytest/x52_test_clock.c:44 msgid "" "\n" "Testing clock time hour display for 36 hours, 12 hour mode" msgstr "" -#: x52test/x52_test_clock.c:47 +#: joytest/x52_test_clock.c:47 msgid "" "\n" "Testing clock time hour display for 36 hours, 24 hour mode" msgstr "" -#: x52test/x52_test_clock.c:52 +#: joytest/x52_test_clock.c:52 msgid "" "\n" "Testing clock date display for 31 days, dd-mm-yy" msgstr "" -#: x52test/x52_test_clock.c:56 +#: joytest/x52_test_clock.c:56 msgid "" "\n" "Testing clock date display for 31 days, mm-dd-yy" msgstr "" -#: x52test/x52_test_clock.c:60 +#: joytest/x52_test_clock.c:60 msgid "" "\n" "Testing clock date display for 31 days, yy-mm-dd" msgstr "" -#: x52test/x52_test_common.h:26 +#: joytest/x52_test_common.h:26 #, c-format msgid "" "\n" "%s(%s) failed with %d(%s)\n" msgstr "" -#: x52test/x52_test_common.h:32 +#: joytest/x52_test_common.h:32 #, c-format msgid "" "\n" "update failed with %d(%s)\n" msgstr "" -#: x52test/x52_test_led.c:19 +#: joytest/x52_test_led.c:19 #, c-format msgid "LED %s - %s\n" 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 msgid "" "\n" "Testing LED %s\n" msgstr "" -#: x52test/x52_test_led.c:42 +#: joytest/x52_test_led.c:42 msgid "LEDs" 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" msgstr "" -#: x52test/x52_test_led.c:55 +#: joytest/x52_test_led.c:55 msgid "This cycles the LEDs through all possible states" msgstr "" -#: x52test/x52_test_led.c:73 +#: joytest/x52_test_led.c:73 #, c-format msgid "" "\n" "Testing %s\n" msgstr "" -#: x52test/x52_test_led.c:84 +#: joytest/x52_test_led.c:84 msgid "Blink & Shift" msgstr "" -#: x52test/x52_test_led.c:85 +#: joytest/x52_test_led.c:85 msgid "This tests the blink indicator and shift functionality" msgstr "" -#: x52test/x52_test_mfd.c:24 +#: joytest/x52_test_mfd.c:24 msgid "Brightness" msgstr "" -#: x52test/x52_test_mfd.c:26 +#: joytest/x52_test_mfd.c:26 msgid "This test cycles through the MFD and LED brightness scales" msgstr "" -#: x52test/x52_test_mfd.c:29 +#: joytest/x52_test_mfd.c:29 msgid "" "\n" "MFD: " msgstr "" -#: x52test/x52_test_mfd.c:36 +#: joytest/x52_test_mfd.c:36 msgid "" "\n" "LED: " msgstr "" -#: x52test/x52_test_mfd.c:55 +#: joytest/x52_test_mfd.c:55 msgid "MFD text" msgstr "" -#: x52test/x52_test_mfd.c:56 +#: joytest/x52_test_mfd.c:56 msgid "This test tests the character displays of the MFD\n" msgstr "" -#: x52test/x52_test_mfd.c:60 +#: joytest/x52_test_mfd.c:60 #, c-format msgid "Writing characters %s\n" msgstr "" -#: x52test/x52_test_mfd.c:82 +#: joytest/x52_test_mfd.c:82 msgid "MFD display" msgstr "" -#: x52test/x52_test_mfd.c:83 +#: joytest/x52_test_mfd.c:83 msgid "" "This test checks if the display elements can display all characters\n" "You should see the display cycling through each character, with every\n" "cell displaying the same character\n" msgstr "" -#: x52test/x52_test_mfd.c:88 +#: joytest/x52_test_mfd.c:88 #, c-format msgid "Testing character 0x%02x..." msgstr "" -#: x52test/x52_test_mfd.c:96 +#: joytest/x52_test_mfd.c:96 msgid "OK" msgstr "" diff --git a/po/xx_PL.po b/po/xx_PL.po index 1b21b52..f5a4e9a 100644 --- a/po/xx_PL.po +++ b/po/xx_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: x52pro-linux 0.2.1\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" "Last-Translator: Nirenjan Krishnan \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" msgstr "Eventay @ %ld.%06ld: %s, aluevay %d\n" -#: x52test/x52_test.c:97 +#: joytest/x52_test.c:97 msgid "Test brightness scale (~ 1m)" msgstr "Esttay ightnessbray alescay (~ 1m)" -#: x52test/x52_test.c:98 +#: joytest/x52_test.c:98 msgid "Test LED states (~ 45s)" msgstr "Esstay EDLay atesstay (~ 45s)" -#: x52test/x52_test.c:99 +#: joytest/x52_test.c:99 msgid "Test MFD string display (~ 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)" 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)" msgstr "Esttay ethay inkblay anday iftshay ommandscay (< 10s)" -#: x52test/x52_test.c:102 +#: joytest/x52_test.c:102 msgid "Test the clock commands (~1m)" msgstr "Esttay ethay ockclay ommandscay (~1m)" -#: x52test/x52_test.c:126 +#: joytest/x52_test.c:126 msgid "" "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" @@ -288,36 +288,36 @@ msgstr "" "X52 Pro eviceday anday esttay ethay extray unctionalityfay\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" 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" msgstr "" "Esspray Enteray otay eginbay ethay eststay, esspray Ctrl-C otay abortay " "anytimeay" -#: x52test/x52_test.c:138 +#: joytest/x52_test.c:138 #, c-format msgid "Unable to initialize X52 library: %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" msgstr "Allay eststay ompletedcay uccessfullysay" -#: x52test/x52_test.c:155 +#: joytest/x52_test.c:155 #, c-format msgid "Got error %s\n" msgstr "Otgay erroray %s\n" -#: x52test/x52_test.c:157 +#: joytest/x52_test.c:157 #, c-format msgid "Received %s signal, quitting...\n" msgstr "Eceivedray %s ignalsay, uittingqay...\n" -#: x52test/x52_test.c:176 +#: joytest/x52_test.c:176 msgid "" "These are the available tests with a description and\n" "approximate runtime. Not specifying any tests will run\n" @@ -328,18 +328,18 @@ msgstr "" "ecifyingspay anyay eststay illway unray allay ethay\n" "eststay\n" -#: x52test/x52_test.c:180 +#: joytest/x52_test.c:180 msgid "List of tests:" msgstr "Istlay ofay eststay:" -#: x52test/x52_test.c:230 +#: joytest/x52_test.c:230 #, c-format msgid "" "Usage: %s [list of tests]\n" "\n" msgstr "Usageay: %s [istlay ofay eststay]\n" -#: x52test/x52_test.c:244 +#: joytest/x52_test.c:244 #, c-format msgid "" "Unrecognized test identifier: %s\n" @@ -348,19 +348,19 @@ msgstr "" "Unrecognizeday esttay identifieray: %s\n" "\n" -#: x52test/x52_test.c:257 +#: joytest/x52_test.c:257 msgid "Not running any tests" msgstr "Otnay unningray anyay eststay" -#: x52test/x52_test_clock.c:32 +#: joytest/x52_test_clock.c:32 msgid "Clock" msgstr "Ockclay" -#: x52test/x52_test_clock.c:33 +#: joytest/x52_test_clock.c:33 msgid "This tests the clock display" msgstr "Isthay eststay ethay ockclay isplayday" -#: x52test/x52_test_clock.c:38 +#: joytest/x52_test_clock.c:38 msgid "" "\n" "Testing clock time minute display for 90 minutes" @@ -368,7 +368,7 @@ msgstr "" "\n" "Estingtay ockclay imetay inutemay isplayday orfay 90 inutesmay" -#: x52test/x52_test_clock.c:44 +#: joytest/x52_test_clock.c:44 msgid "" "\n" "Testing clock time hour display for 36 hours, 12 hour mode" @@ -376,7 +376,7 @@ msgstr "" "\n" "Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 12 ourhay odemay" -#: x52test/x52_test_clock.c:47 +#: joytest/x52_test_clock.c:47 msgid "" "\n" "Testing clock time hour display for 36 hours, 24 hour mode" @@ -384,7 +384,7 @@ msgstr "" "\n" "Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 24 ourhay odemay" -#: x52test/x52_test_clock.c:52 +#: joytest/x52_test_clock.c:52 msgid "" "\n" "Testing clock date display for 31 days, dd-mm-yy" @@ -392,7 +392,7 @@ msgstr "" "\n" "Estingtay ockclay ateday isplayday orfay 31 aysday, dd-mm-yy" -#: x52test/x52_test_clock.c:56 +#: joytest/x52_test_clock.c:56 msgid "" "\n" "Testing clock date display for 31 days, mm-dd-yy" @@ -400,7 +400,7 @@ msgstr "" "\n" "Estingtay ockclay ateday isplayday orfay 31 aysday, mm-dd-yy" -#: x52test/x52_test_clock.c:60 +#: joytest/x52_test_clock.c:60 msgid "" "\n" "Testing clock date display for 31 days, yy-mm-dd" @@ -408,7 +408,7 @@ msgstr "" "\n" "Estingtay ockclay ateday isplayday orfay 31 aysday, yy-mm-dd" -#: x52test/x52_test_common.h:26 +#: joytest/x52_test_common.h:26 #, c-format msgid "" "\n" @@ -417,7 +417,7 @@ msgstr "" "\n" "%s(%s) ailedfay ithway %d(%s)\n" -#: x52test/x52_test_common.h:32 +#: joytest/x52_test_common.h:32 #, c-format msgid "" "\n" @@ -426,12 +426,12 @@ msgstr "" "\n" "updateay ailedfay ithway %d(%s)\n" -#: x52test/x52_test_led.c:19 +#: joytest/x52_test_led.c:19 #, c-format msgid "LED %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 msgid "" "\n" @@ -440,21 +440,21 @@ msgstr "" "\n" "Estingtay EDLay %s\n" -#: x52test/x52_test_led.c:42 +#: joytest/x52_test_led.c:42 msgid "LEDs" 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" msgstr "" "Ippingskay EDLay eststay incesay ethay eviceday oesday otnay\n" "upportsay EDLay ontrolcay" -#: x52test/x52_test_led.c:55 +#: joytest/x52_test_led.c:55 msgid "This cycles the LEDs through all possible states" msgstr "Isthay yclescay ethay EDsLay oughthray allay ossiblepay tatessay" -#: x52test/x52_test_led.c:73 +#: joytest/x52_test_led.c:73 #, c-format msgid "" "\n" @@ -463,25 +463,25 @@ msgstr "" "\n" "Estingtay %s\n" -#: x52test/x52_test_led.c:84 +#: joytest/x52_test_led.c:84 msgid "Blink & Shift" msgstr "Inkblay & Iftshay" -#: x52test/x52_test_led.c:85 +#: joytest/x52_test_led.c:85 msgid "This tests the blink indicator and shift functionality" msgstr "Isthay eststay ethay inkblay indicatoray anday iftshay unctionalityfay" -#: x52test/x52_test_mfd.c:24 +#: joytest/x52_test_mfd.c:24 msgid "Brightness" 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" msgstr "" "Isthay esttay yclescay oughthray ethay FDMay anday EDLay ightnessbray " "alesscay" -#: x52test/x52_test_mfd.c:29 +#: joytest/x52_test_mfd.c:29 msgid "" "\n" "MFD: " @@ -489,7 +489,7 @@ msgstr "" "\n" "FDMay: " -#: x52test/x52_test_mfd.c:36 +#: joytest/x52_test_mfd.c:36 msgid "" "\n" "LED: " @@ -497,24 +497,24 @@ msgstr "" "\n" "EDLay: " -#: x52test/x52_test_mfd.c:55 +#: joytest/x52_test_mfd.c:55 msgid "MFD text" 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" 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 msgid "Writing characters %s\n" msgstr "Itingwray aracterschay %s\n" -#: x52test/x52_test_mfd.c:82 +#: joytest/x52_test_mfd.c:82 msgid "MFD display" msgstr "FDMay isplayday" -#: x52test/x52_test_mfd.c:83 +#: joytest/x52_test_mfd.c:83 msgid "" "This test checks if the display elements can display all characters\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" "amesay aracterchay\n" -#: x52test/x52_test_mfd.c:88 +#: joytest/x52_test_mfd.c:88 #, c-format msgid "Testing character 0x%02x..." msgstr "Estingtay aracterchay 0x%02x..." -#: x52test/x52_test_mfd.c:96 +#: joytest/x52_test_mfd.c:96 msgid "OK" msgstr "OKay" diff --git a/udev/Makefile.am b/udev/Makefile.am index b2d9258..f2cf713 100644 --- a/udev/Makefile.am +++ b/udev/Makefile.am @@ -4,8 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 -# Extra files that need to be in the distribution -EXTRA_DIST = 60-saitek-x52-x52pro.rules +EXTRA_DIST += udev/60-saitek-x52-x52pro.rules 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 # running as root. Therefore, disable this if we're running 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 install-data-hook: diff --git a/x52cli/Makefile.am b/x52cli/Makefile.am deleted file mode 100644 index 5117f13..0000000 --- a/x52cli/Makefile.am +++ /dev/null @@ -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