From 3b2378a54be9d8e08668a6f20912520d96ae811d Mon Sep 17 00:00:00 2001
From: nirenjan <nirenjan@gmail.com>
Date: Thu, 29 Jul 2021 21:57:19 -0700
Subject: [PATCH] Move libusbx52 to top level

---
 Makefile.am                                            | 2 +-
 configure.ac                                           | 2 +-
 lib/Makefile.am                                        | 2 +-
 {lib/libusbx52 => libusbx52}/Makefile.am               | 0
 {lib/libusbx52 => libusbx52}/README.md                 | 0
 {lib/libusbx52 => libusbx52}/fopen_env.c               | 0
 {lib/libusbx52 => libusbx52}/libusbx52.h               | 0
 {lib/libusbx52 => libusbx52}/usb_x52_stub.c            | 0
 {lib/libusbx52 => libusbx52}/util/create_device_list.c | 0
 {lib/libusbx52 => libusbx52}/util/log_actions.c        | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename {lib/libusbx52 => libusbx52}/Makefile.am (100%)
 rename {lib/libusbx52 => libusbx52}/README.md (100%)
 rename {lib/libusbx52 => libusbx52}/fopen_env.c (100%)
 rename {lib/libusbx52 => libusbx52}/libusbx52.h (100%)
 rename {lib/libusbx52 => libusbx52}/usb_x52_stub.c (100%)
 rename {lib/libusbx52 => libusbx52}/util/create_device_list.c (100%)
 rename {lib/libusbx52 => libusbx52}/util/log_actions.c (100%)

diff --git a/Makefile.am b/Makefile.am
index cc29bee..1e6671a 100644
--- 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 = \
diff --git a/configure.ac b/configure.ac
index 4037f6d..f7c5bac 100644
--- 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
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4cb87c4..e067e74 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 pinelog
+SUBDIRS = pinelog
 
diff --git a/lib/libusbx52/Makefile.am b/libusbx52/Makefile.am
similarity index 100%
rename from lib/libusbx52/Makefile.am
rename to libusbx52/Makefile.am
diff --git a/lib/libusbx52/README.md b/libusbx52/README.md
similarity index 100%
rename from lib/libusbx52/README.md
rename to libusbx52/README.md
diff --git a/lib/libusbx52/fopen_env.c b/libusbx52/fopen_env.c
similarity index 100%
rename from lib/libusbx52/fopen_env.c
rename to libusbx52/fopen_env.c
diff --git a/lib/libusbx52/libusbx52.h b/libusbx52/libusbx52.h
similarity index 100%
rename from lib/libusbx52/libusbx52.h
rename to libusbx52/libusbx52.h
diff --git a/lib/libusbx52/usb_x52_stub.c b/libusbx52/usb_x52_stub.c
similarity index 100%
rename from lib/libusbx52/usb_x52_stub.c
rename to libusbx52/usb_x52_stub.c
diff --git a/lib/libusbx52/util/create_device_list.c b/libusbx52/util/create_device_list.c
similarity index 100%
rename from lib/libusbx52/util/create_device_list.c
rename to libusbx52/util/create_device_list.c
diff --git a/lib/libusbx52/util/log_actions.c b/libusbx52/util/log_actions.c
similarity index 100%
rename from lib/libusbx52/util/log_actions.c
rename to libusbx52/util/log_actions.c