From 29d6b64d18a1a7f9f085009100faf7d2433a7844 Mon Sep 17 00:00:00 2001 From: nirenjan Date: Thu, 13 Jun 2024 11:11:43 -0700 Subject: [PATCH] refactor: Move support libraries to subprojects directory This change is necessary to support Meson subprojects --- Makefile.am | 2 +- configure.ac | 6 +++--- daemon/Makefile.am | 12 ++++++------ {lib => subprojects}/Makefile.am | 0 {lib => subprojects}/inih/LICENSE.txt | 0 {lib => subprojects}/inih/Makefile.am | 0 {lib => subprojects}/inih/README.md | 0 {lib => subprojects}/inih/ini.c | 0 {lib => subprojects}/inih/ini.h | 0 {lib => subprojects}/pinelog/.gitignore | 0 {lib => subprojects}/pinelog/LICENSE | 0 {lib => subprojects}/pinelog/Makefile.am | 0 {lib => subprojects}/pinelog/README.md | 0 {lib => subprojects}/pinelog/autogen.sh | 0 {lib => subprojects}/pinelog/bench_pinelog.c | 0 {lib => subprojects}/pinelog/configure.ac | 0 .../pinelog/m4/ax_append_compile_flags.m4 | 0 {lib => subprojects}/pinelog/m4/ax_append_flag.m4 | 0 .../pinelog/m4/ax_append_link_flags.m4 | 0 .../pinelog/m4/ax_check_compile_flag.m4 | 0 .../pinelog/m4/ax_check_link_flag.m4 | 0 {lib => subprojects}/pinelog/m4/ax_compiler_flags.m4 | 0 .../pinelog/m4/ax_compiler_flags_cflags.m4 | 0 .../pinelog/m4/ax_compiler_flags_gir.m4 | 0 .../pinelog/m4/ax_compiler_flags_ldflags.m4 | 0 .../pinelog/m4/ax_gcc_func_attribute.m4 | 0 .../pinelog/m4/ax_require_defined.m4 | 0 {lib => subprojects}/pinelog/meson.build | 0 {lib => subprojects}/pinelog/pinelog.c | 0 {lib => subprojects}/pinelog/pinelog.h | 0 {lib => subprojects}/pinelog/test_pinelog.c | 0 31 files changed, 10 insertions(+), 10 deletions(-) rename {lib => subprojects}/Makefile.am (100%) rename {lib => subprojects}/inih/LICENSE.txt (100%) rename {lib => subprojects}/inih/Makefile.am (100%) rename {lib => subprojects}/inih/README.md (100%) rename {lib => subprojects}/inih/ini.c (100%) rename {lib => subprojects}/inih/ini.h (100%) rename {lib => subprojects}/pinelog/.gitignore (100%) rename {lib => subprojects}/pinelog/LICENSE (100%) rename {lib => subprojects}/pinelog/Makefile.am (100%) rename {lib => subprojects}/pinelog/README.md (100%) rename {lib => subprojects}/pinelog/autogen.sh (100%) rename {lib => subprojects}/pinelog/bench_pinelog.c (100%) rename {lib => subprojects}/pinelog/configure.ac (100%) rename {lib => subprojects}/pinelog/m4/ax_append_compile_flags.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_append_flag.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_append_link_flags.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_check_compile_flag.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_check_link_flag.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_compiler_flags.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_compiler_flags_cflags.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_compiler_flags_gir.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_compiler_flags_ldflags.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_gcc_func_attribute.m4 (100%) rename {lib => subprojects}/pinelog/m4/ax_require_defined.m4 (100%) rename {lib => subprojects}/pinelog/meson.build (100%) rename {lib => subprojects}/pinelog/pinelog.c (100%) rename {lib => subprojects}/pinelog/pinelog.h (100%) rename {lib => subprojects}/pinelog/test_pinelog.c (100%) diff --git a/Makefile.am b/Makefile.am index ea7ef22..53f9e85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I m4 # Build any support libraries first -SUBDIRS = lib +SUBDIRS = subprojects if USE_NLS SUBDIRS += po diff --git a/configure.ac b/configure.ac index b5a02dd..e85ed7e 100644 --- a/configure.ac +++ b/configure.ac @@ -135,12 +135,12 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ po/Makefile.in Makefile - lib/Makefile + subprojects/Makefile libx52/libx52.pc libx52io/libx52io.pc libx52util/libx52util.pc - lib/pinelog/Makefile - lib/inih/Makefile + subprojects/pinelog/Makefile + subprojects/inih/Makefile udev/60-saitek-x52-x52pro.rules ]) AC_OUTPUT diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 98e6244..346fcb0 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -26,8 +26,8 @@ x52d_CFLAGS = \ -I $(top_srcdir)/libx52io \ -I $(top_srcdir)/libx52 \ -I $(top_srcdir)/libx52util \ - -I $(top_srcdir)/lib/pinelog \ - -I $(top_srcdir)/lib/inih \ + -I $(top_srcdir)/subprojects/pinelog \ + -I $(top_srcdir)/subprojects/inih \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLOCALEDIR=\"$(localedir)\" \ -DLOGDIR=\"$(localstatedir)/log\" \ @@ -36,8 +36,8 @@ x52d_CFLAGS = \ x52d_LDFLAGS = @PTHREAD_LIBS@ $(WARN_LDFLAGS) x52d_LDADD = \ - lib/pinelog/libpinelog.la \ - lib/inih/libinih.la \ + subprojects/pinelog/libpinelog.la \ + subprojects/inih/libinih.la \ libx52.la \ @LTLIBINTL@ @@ -125,11 +125,11 @@ x52d_mouse_test_CFLAGS = \ -I $(top_srcdir) \ -I $(top_srcdir)/libx52 \ -I $(top_srcdir)/libx52io \ - -I $(top_srcdir)/lib/pinelog \ + -I $(top_srcdir)/subprojects/pinelog \ $(WARN_CFLAGS) @CMOCKA_CFLAGS@ x52d_mouse_test_LDFLAGS = @CMOCKA_LIBS@ $(WARN_LDFLAGS) x52d_mouse_test_LDADD = \ - lib/pinelog/libpinelog.la \ + subprojects/pinelog/libpinelog.la \ @LTLIBINTL@ TESTS += x52d-mouse-test diff --git a/lib/Makefile.am b/subprojects/Makefile.am similarity index 100% rename from lib/Makefile.am rename to subprojects/Makefile.am diff --git a/lib/inih/LICENSE.txt b/subprojects/inih/LICENSE.txt similarity index 100% rename from lib/inih/LICENSE.txt rename to subprojects/inih/LICENSE.txt diff --git a/lib/inih/Makefile.am b/subprojects/inih/Makefile.am similarity index 100% rename from lib/inih/Makefile.am rename to subprojects/inih/Makefile.am diff --git a/lib/inih/README.md b/subprojects/inih/README.md similarity index 100% rename from lib/inih/README.md rename to subprojects/inih/README.md diff --git a/lib/inih/ini.c b/subprojects/inih/ini.c similarity index 100% rename from lib/inih/ini.c rename to subprojects/inih/ini.c diff --git a/lib/inih/ini.h b/subprojects/inih/ini.h similarity index 100% rename from lib/inih/ini.h rename to subprojects/inih/ini.h diff --git a/lib/pinelog/.gitignore b/subprojects/pinelog/.gitignore similarity index 100% rename from lib/pinelog/.gitignore rename to subprojects/pinelog/.gitignore diff --git a/lib/pinelog/LICENSE b/subprojects/pinelog/LICENSE similarity index 100% rename from lib/pinelog/LICENSE rename to subprojects/pinelog/LICENSE diff --git a/lib/pinelog/Makefile.am b/subprojects/pinelog/Makefile.am similarity index 100% rename from lib/pinelog/Makefile.am rename to subprojects/pinelog/Makefile.am diff --git a/lib/pinelog/README.md b/subprojects/pinelog/README.md similarity index 100% rename from lib/pinelog/README.md rename to subprojects/pinelog/README.md diff --git a/lib/pinelog/autogen.sh b/subprojects/pinelog/autogen.sh similarity index 100% rename from lib/pinelog/autogen.sh rename to subprojects/pinelog/autogen.sh diff --git a/lib/pinelog/bench_pinelog.c b/subprojects/pinelog/bench_pinelog.c similarity index 100% rename from lib/pinelog/bench_pinelog.c rename to subprojects/pinelog/bench_pinelog.c diff --git a/lib/pinelog/configure.ac b/subprojects/pinelog/configure.ac similarity index 100% rename from lib/pinelog/configure.ac rename to subprojects/pinelog/configure.ac diff --git a/lib/pinelog/m4/ax_append_compile_flags.m4 b/subprojects/pinelog/m4/ax_append_compile_flags.m4 similarity index 100% rename from lib/pinelog/m4/ax_append_compile_flags.m4 rename to subprojects/pinelog/m4/ax_append_compile_flags.m4 diff --git a/lib/pinelog/m4/ax_append_flag.m4 b/subprojects/pinelog/m4/ax_append_flag.m4 similarity index 100% rename from lib/pinelog/m4/ax_append_flag.m4 rename to subprojects/pinelog/m4/ax_append_flag.m4 diff --git a/lib/pinelog/m4/ax_append_link_flags.m4 b/subprojects/pinelog/m4/ax_append_link_flags.m4 similarity index 100% rename from lib/pinelog/m4/ax_append_link_flags.m4 rename to subprojects/pinelog/m4/ax_append_link_flags.m4 diff --git a/lib/pinelog/m4/ax_check_compile_flag.m4 b/subprojects/pinelog/m4/ax_check_compile_flag.m4 similarity index 100% rename from lib/pinelog/m4/ax_check_compile_flag.m4 rename to subprojects/pinelog/m4/ax_check_compile_flag.m4 diff --git a/lib/pinelog/m4/ax_check_link_flag.m4 b/subprojects/pinelog/m4/ax_check_link_flag.m4 similarity index 100% rename from lib/pinelog/m4/ax_check_link_flag.m4 rename to subprojects/pinelog/m4/ax_check_link_flag.m4 diff --git a/lib/pinelog/m4/ax_compiler_flags.m4 b/subprojects/pinelog/m4/ax_compiler_flags.m4 similarity index 100% rename from lib/pinelog/m4/ax_compiler_flags.m4 rename to subprojects/pinelog/m4/ax_compiler_flags.m4 diff --git a/lib/pinelog/m4/ax_compiler_flags_cflags.m4 b/subprojects/pinelog/m4/ax_compiler_flags_cflags.m4 similarity index 100% rename from lib/pinelog/m4/ax_compiler_flags_cflags.m4 rename to subprojects/pinelog/m4/ax_compiler_flags_cflags.m4 diff --git a/lib/pinelog/m4/ax_compiler_flags_gir.m4 b/subprojects/pinelog/m4/ax_compiler_flags_gir.m4 similarity index 100% rename from lib/pinelog/m4/ax_compiler_flags_gir.m4 rename to subprojects/pinelog/m4/ax_compiler_flags_gir.m4 diff --git a/lib/pinelog/m4/ax_compiler_flags_ldflags.m4 b/subprojects/pinelog/m4/ax_compiler_flags_ldflags.m4 similarity index 100% rename from lib/pinelog/m4/ax_compiler_flags_ldflags.m4 rename to subprojects/pinelog/m4/ax_compiler_flags_ldflags.m4 diff --git a/lib/pinelog/m4/ax_gcc_func_attribute.m4 b/subprojects/pinelog/m4/ax_gcc_func_attribute.m4 similarity index 100% rename from lib/pinelog/m4/ax_gcc_func_attribute.m4 rename to subprojects/pinelog/m4/ax_gcc_func_attribute.m4 diff --git a/lib/pinelog/m4/ax_require_defined.m4 b/subprojects/pinelog/m4/ax_require_defined.m4 similarity index 100% rename from lib/pinelog/m4/ax_require_defined.m4 rename to subprojects/pinelog/m4/ax_require_defined.m4 diff --git a/lib/pinelog/meson.build b/subprojects/pinelog/meson.build similarity index 100% rename from lib/pinelog/meson.build rename to subprojects/pinelog/meson.build diff --git a/lib/pinelog/pinelog.c b/subprojects/pinelog/pinelog.c similarity index 100% rename from lib/pinelog/pinelog.c rename to subprojects/pinelog/pinelog.c diff --git a/lib/pinelog/pinelog.h b/subprojects/pinelog/pinelog.h similarity index 100% rename from lib/pinelog/pinelog.h rename to subprojects/pinelog/pinelog.h diff --git a/lib/pinelog/test_pinelog.c b/subprojects/pinelog/test_pinelog.c similarity index 100% rename from lib/pinelog/test_pinelog.c rename to subprojects/pinelog/test_pinelog.c