From 7f30863e5da9de104f202a430b542623dbe0110e Mon Sep 17 00:00:00 2001 From: nirenjan Date: Thu, 29 Jul 2021 21:51:11 -0700 Subject: [PATCH] Move libx52io to top level --- Makefile.am | 2 +- configure.ac | 2 +- daemon/Makefile.am | 2 +- lib/Makefile.am | 2 +- {lib/libx52io => libx52io}/Makefile.am | 0 {lib/libx52io => libx52io}/io_axis.c | 0 {lib/libx52io => libx52io}/io_common.h | 0 {lib/libx52io => libx52io}/io_core.c | 0 {lib/libx52io => libx52io}/io_device.c | 0 {lib/libx52io => libx52io}/io_parser.c | 0 {lib/libx52io => libx52io}/io_strings.c | 0 {lib/libx52io => libx52io}/libx52io.h | 0 {lib/libx52io => libx52io}/test_axis.c | 0 {lib/libx52io => libx52io}/test_parser.c | 0 {lib/libx52io => libx52io}/test_parser_tests.c | 0 po/POTFILES.in | 2 +- po/x52pro-linux.pot | 18 +++++++++--------- po/xx_PL.po | 18 +++++++++--------- utils/evtest/Makefile.am | 4 ++-- 19 files changed, 25 insertions(+), 25 deletions(-) rename {lib/libx52io => libx52io}/Makefile.am (100%) rename {lib/libx52io => libx52io}/io_axis.c (100%) rename {lib/libx52io => libx52io}/io_common.h (100%) rename {lib/libx52io => libx52io}/io_core.c (100%) rename {lib/libx52io => libx52io}/io_device.c (100%) rename {lib/libx52io => libx52io}/io_parser.c (100%) rename {lib/libx52io => libx52io}/io_strings.c (100%) rename {lib/libx52io => libx52io}/libx52io.h (100%) rename {lib/libx52io => libx52io}/test_axis.c (100%) rename {lib/libx52io => libx52io}/test_parser.c (100%) rename {lib/libx52io => libx52io}/test_parser_tests.c (100%) diff --git a/Makefile.am b/Makefile.am index 8d4a990..cc29bee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ if USE_NLS po_SUBDIRS = po endif -SUBDIRS = $(po_SUBDIRS) libx52 libx52util lib utils daemon tests udev +SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io lib utils daemon tests udev # Extra files that need to be in the distribution EXTRA_DIST = \ diff --git a/configure.ac b/configure.ac index 72caabe..4037f6d 100644 --- a/configure.ac +++ b/configure.ac @@ -128,7 +128,7 @@ AC_CONFIG_FILES([ po/Makefile.in libx52/libx52.pc lib/libusbx52/Makefile libx52util/Makefile - lib/libx52io/Makefile + libx52io/Makefile lib/pinelog/Makefile udev/Makefile udev/60-saitek-x52-x52pro.rules diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ed5b30d..f26358c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -15,7 +15,7 @@ x52d_SOURCES = \ x52d_CFLAGS = \ -I $(top_srcdir) \ - -I $(top_srcdir)/lib/libx52io \ + -I $(top_srcdir)/libx52io \ -I $(top_srcdir)/libx52 \ -I $(top_srcdir)/libx52util \ -I $(top_srcdir)/lib/pinelog \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 2e6e4d5..4cb87c4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,5 +4,5 @@ # # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 -SUBDIRS = libusbx52 libx52io pinelog +SUBDIRS = libusbx52 pinelog diff --git a/lib/libx52io/Makefile.am b/libx52io/Makefile.am similarity index 100% rename from lib/libx52io/Makefile.am rename to libx52io/Makefile.am diff --git a/lib/libx52io/io_axis.c b/libx52io/io_axis.c similarity index 100% rename from lib/libx52io/io_axis.c rename to libx52io/io_axis.c diff --git a/lib/libx52io/io_common.h b/libx52io/io_common.h similarity index 100% rename from lib/libx52io/io_common.h rename to libx52io/io_common.h diff --git a/lib/libx52io/io_core.c b/libx52io/io_core.c similarity index 100% rename from lib/libx52io/io_core.c rename to libx52io/io_core.c diff --git a/lib/libx52io/io_device.c b/libx52io/io_device.c similarity index 100% rename from lib/libx52io/io_device.c rename to libx52io/io_device.c diff --git a/lib/libx52io/io_parser.c b/libx52io/io_parser.c similarity index 100% rename from lib/libx52io/io_parser.c rename to libx52io/io_parser.c diff --git a/lib/libx52io/io_strings.c b/libx52io/io_strings.c similarity index 100% rename from lib/libx52io/io_strings.c rename to libx52io/io_strings.c diff --git a/lib/libx52io/libx52io.h b/libx52io/libx52io.h similarity index 100% rename from lib/libx52io/libx52io.h rename to libx52io/libx52io.h diff --git a/lib/libx52io/test_axis.c b/libx52io/test_axis.c similarity index 100% rename from lib/libx52io/test_axis.c rename to libx52io/test_axis.c diff --git a/lib/libx52io/test_parser.c b/libx52io/test_parser.c similarity index 100% rename from lib/libx52io/test_parser.c rename to libx52io/test_parser.c diff --git a/lib/libx52io/test_parser_tests.c b/libx52io/test_parser_tests.c similarity index 100% rename from lib/libx52io/test_parser_tests.c rename to libx52io/test_parser_tests.c diff --git a/po/POTFILES.in b/po/POTFILES.in index a1a0dad..b67b980 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,7 +2,7 @@ libx52/x52_strerror.c libx52/x52_stringify.c -lib/libx52io/io_strings.c +libx52io/io_strings.c utils/evtest/ev_test.c diff --git a/po/x52pro-linux.pot b/po/x52pro-linux.pot index d0c1964..e88fb33 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 21:40-0700\n" +"POT-Creation-Date: 2021-07-29 21:50-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: libx52/x52_strerror.c:23 lib/libx52io/io_strings.c:101 +#: libx52/x52_strerror.c:23 libx52io/io_strings.c:101 msgid "Success" msgstr "" -#: libx52/x52_strerror.c:24 lib/libx52io/io_strings.c:102 +#: libx52/x52_strerror.c:24 libx52io/io_strings.c:102 msgid "Initialization failure" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid "System call interrupted" msgstr "" -#: libx52/x52_strerror.c:66 lib/libx52io/io_strings.c:125 +#: libx52/x52_strerror.c:66 libx52io/io_strings.c:125 #, c-format msgid "Unknown error %d" msgstr "" @@ -211,23 +211,23 @@ msgstr "" msgid "Unknown LED ID %d" msgstr "" -#: lib/libx52io/io_strings.c:103 +#: libx52io/io_strings.c:103 msgid "No device" msgstr "" -#: lib/libx52io/io_strings.c:104 +#: libx52io/io_strings.c:104 msgid "Invalid arguments" msgstr "" -#: lib/libx52io/io_strings.c:105 +#: libx52io/io_strings.c:105 msgid "Connection failure" msgstr "" -#: lib/libx52io/io_strings.c:106 +#: libx52io/io_strings.c:106 msgid "I/O error" msgstr "" -#: lib/libx52io/io_strings.c:107 +#: libx52io/io_strings.c:107 msgid "Read timeout" msgstr "" diff --git a/po/xx_PL.po b/po/xx_PL.po index 08b4759..12121dc 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 21:40-0700\n" +"POT-Creation-Date: 2021-07-29 21:50-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" @@ -17,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.0\n" -#: libx52/x52_strerror.c:23 lib/libx52io/io_strings.c:101 +#: libx52/x52_strerror.c:23 libx52io/io_strings.c:101 msgid "Success" msgstr "Uccesssay" -#: libx52/x52_strerror.c:24 lib/libx52io/io_strings.c:102 +#: libx52/x52_strerror.c:24 libx52io/io_strings.c:102 msgid "Initialization failure" msgstr "Initializationay ailurefay" @@ -85,7 +85,7 @@ msgstr "Ipepay erroray" msgid "System call interrupted" msgstr "Ystemsay allcay interrupteday" -#: libx52/x52_strerror.c:66 lib/libx52io/io_strings.c:125 +#: libx52/x52_strerror.c:66 libx52io/io_strings.c:125 #, c-format msgid "Unknown error %d" msgstr "Unknownay erroray %d" @@ -211,23 +211,23 @@ msgstr "Ottlethray" msgid "Unknown LED ID %d" msgstr "Unknownay EDLay IDay %d" -#: lib/libx52io/io_strings.c:103 +#: libx52io/io_strings.c:103 msgid "No device" msgstr "Onay eviceday" -#: lib/libx52io/io_strings.c:104 +#: libx52io/io_strings.c:104 msgid "Invalid arguments" msgstr "Invaliday argumentsay" -#: lib/libx52io/io_strings.c:105 +#: libx52io/io_strings.c:105 msgid "Connection failure" msgstr "Onnectioncay ailurefay" -#: lib/libx52io/io_strings.c:106 +#: libx52io/io_strings.c:106 msgid "I/O error" msgstr "I/O erroray" -#: lib/libx52io/io_strings.c:107 +#: libx52io/io_strings.c:107 msgid "Read timeout" msgstr "Eadray imeouttay" diff --git a/utils/evtest/Makefile.am b/utils/evtest/Makefile.am index b676c05..dc62cbc 100644 --- a/utils/evtest/Makefile.am +++ b/utils/evtest/Makefile.am @@ -10,6 +10,6 @@ bin_PROGRAMS = x52evtest # Event test utility that works similarly to the Linux evtest x52evtest_SOURCES = ev_test.c -x52evtest_CFLAGS = -I $(top_srcdir)/lib/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_LDADD = ../../lib/libx52io/libx52io.la +x52evtest_LDADD = ../../libx52io/libx52io.la