Reorganize source layout

2017-07-27 17:56:51 -07:00 · 2017-07-27 17:56:51 -07:00 · f0a0a7dcaf
parent 7bc0ba522c
commit f0a0a7dcaf
34 changed files with 15 additions and 10 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libx52 cli util libusbx52 test
+SUBDIRS = lib utils
 # Extra files that need to be in the distribution
 EXTRA_DIST = README.md LICENSE
--- a/configure.ac
+++ b/configure.ac
@ -24,15 +24,16 @@ AS_IF([test "x${have_libusb}" != xyes], [
 ])
 AC_SUBST([X52_PKG_VERSION], [0.1])
-AC_SUBST([X52_INCLUDE], ["-I \$(top_srcdir)/libx52"])
+AC_SUBST([X52_INCLUDE], ["-I \$(top_srcdir)/lib/libx52"])
 AC_SUBST([X52_CORE_LIB], [../libx52/libx52.la])
 AC_CONFIG_FILES([
    Makefile
-    libx52/Makefile
+    lib/Makefile
-    libusbx52/Makefile
+    lib/libx52/Makefile
-    cli/Makefile
+    lib/libusbx52/Makefile
-    util/Makefile
+    lib/libx52util/Makefile
-    test/Makefile
+    utils/Makefile
    utils/cli/Makefile
    utils/test/Makefile
 ])
 AC_OUTPUT
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -0,0 +1,2 @@
 SUBDIRS = libx52 libx52util libusbx52
--- a/lib/libusbx52/Makefile.am
+++ b/lib/libusbx52/Makefile.am
--- a/lib/libusbx52/README.md
+++ b/lib/libusbx52/README.md
--- 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
--- a/lib/libx52/Makefile.am
+++ b/lib/libx52/Makefile.am
--- a/lib/libx52/README.md
+++ b/lib/libx52/README.md
--- a/lib/libx52/libx52.h
+++ b/lib/libx52/libx52.h
--- a/lib/libx52/x52_commands.h
+++ b/lib/libx52/x52_commands.h
--- a/lib/libx52/x52_common.h
+++ b/lib/libx52/x52_common.h
--- a/lib/libx52/x52_control.c
+++ b/lib/libx52/x52_control.c
--- a/lib/libx52/x52_core.c
+++ b/lib/libx52/x52_core.c
--- a/lib/libx52/x52_date_time.c
+++ b/lib/libx52/x52_date_time.c
--- a/lib/libx52/x52_mfd_led.c
+++ b/lib/libx52/x52_mfd_led.c
--- a/lib/libx52util/Makefile.am
+++ b/lib/libx52util/Makefile.am
--- a/lib/libx52util/libx52util.h
+++ b/lib/libx52util/libx52util.h
--- a/lib/libx52util/x52_char_map.cfg
+++ b/lib/libx52util/x52_char_map.cfg
--- a/lib/libx52util/x52_char_map.h
+++ b/lib/libx52util/x52_char_map.h
--- a/lib/libx52util/x52_char_map_gen.py
+++ b/lib/libx52util/x52_char_map_gen.py
--- a/lib/libx52util/x52_char_map_lookup.c
+++ b/lib/libx52util/x52_char_map_lookup.c
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@ -0,0 +1,2 @@
 SUBDIRS = cli test
--- a/utils/cli/Makefile.am
+++ b/utils/cli/Makefile.am
@ -5,7 +5,7 @@ bin_PROGRAMS = x52cli
 # Command line utility that front ends the core library
 x52cli_SOURCES = x52_cli.c
 x52cli_CFLAGS = @X52_INCLUDE@
-x52cli_LDADD = @X52_CORE_LIB@
+x52cli_LDADD = ../../lib/libx52/libx52.la
 # Man pages for CLI utility
 dist_man1_MANS = x52cli.man
--- a/utils/cli/x52_cli.c
+++ b/utils/cli/x52_cli.c
--- a/utils/cli/x52cli.man
+++ b/utils/cli/x52cli.man
--- a/utils/test/Makefile.am
+++ b/utils/test/Makefile.am
@ -5,7 +5,7 @@ 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_CFLAGS = @X52_INCLUDE@
-x52test_LDADD = @X52_CORE_LIB@
+x52test_LDADD = ../../lib/libx52/libx52.la
 # Extra files that need to be in the distribution
 EXTRA_DIST = x52_test_common.h
--- a/utils/test/x52_test.c
+++ b/utils/test/x52_test.c
--- a/utils/test/x52_test_clock.c
+++ b/utils/test/x52_test_clock.c
--- a/utils/test/x52_test_common.h
+++ b/utils/test/x52_test_common.h
--- a/utils/test/x52_test_led.c
+++ b/utils/test/x52_test_led.c
--- a/utils/test/x52_test_mfd.c
+++ b/utils/test/x52_test_mfd.c