Move libusbx52 to top level

2021-07-29 21:57:19 -07:00 · 2021-07-29 21:57:19 -07:00 · 3b2378a54b
parent 7f30863e5d
commit 3b2378a54b
10 changed files with 3 additions and 3 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -10,7 +10,7 @@ if USE_NLS
 po_SUBDIRS = po
 endif
-SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io lib utils daemon tests udev
+SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib utils daemon tests udev
 # Extra files that need to be in the distribution
 EXTRA_DIST = \
--- a/configure.ac
+++ b/configure.ac
@ -126,7 +126,7 @@ AC_CONFIG_FILES([ po/Makefile.in
    lib/Makefile
    libx52/Makefile
    libx52/libx52.pc
-    lib/libusbx52/Makefile
+    libusbx52/Makefile
    libx52util/Makefile
    libx52io/Makefile
    lib/pinelog/Makefile
--- 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 pinelog
+SUBDIRS = pinelog
--- a/lib/libusbx52/Makefile.am
+++ b/lib/libusbx52/Makefile.am
--- a/lib/libusbx52/README.md
+++ b/lib/libusbx52/README.md
--- a/lib/libusbx52/fopen_env.c
+++ b/lib/libusbx52/fopen_env.c
--- a/lib/libusbx52/libusbx52.h
+++ b/lib/libusbx52/libusbx52.h
--- a/lib/libusbx52/usb_x52_stub.c
+++ b/lib/libusbx52/usb_x52_stub.c
--- a/lib/libusbx52/util/create_device_list.c
+++ b/lib/libusbx52/util/create_device_list.c
--- a/lib/libusbx52/util/log_actions.c
+++ b/lib/libusbx52/util/log_actions.c