From c024de52ea4a341dfe25cbd6cafbc369ceabaed4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 23 Oct 2015 07:00:19 +1000 Subject: [PATCH] Merge hidpp10.la and hidpp20.la together into one single helper lib No real reason to keep the two separate, and if we do and need to include both libraries, we get double-defined symbols (all the ones in hidpp-generic.c). This is a helper lib only anyway. Signed-off-by: Peter Hutterer --- src/Makefile.am | 12 +++--------- tools/Makefile.am | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a9ff574d..814e52ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,5 @@ lib_LTLIBRARIES = libratbag.la -noinst_LTLIBRARIES = \ - libhidpp10.la \ - libhidpp20.la +noinst_LTLIBRARIES = libhidpp.la include_HEADERS = \ libratbag.h @@ -49,14 +47,10 @@ EXTRA_DIST = libratbag-version.h.in libratbag.sym # The hidpp libraries are static libraries only for in-tree tools. No API # stability is guaranteed here. -libhidpp10_la_SOURCES = \ +libhidpp_la_SOURCES = \ hidpp-generic.h \ hidpp-generic.c \ hidpp10.h \ - hidpp10.c - -libhidpp20_la_SOURCES = \ - hidpp-generic.h \ - hidpp-generic.c \ + hidpp10.c \ hidpp20.h \ hidpp20.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 7c6f5fdf..e6854234 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -18,11 +18,11 @@ ratbag_command_LDFLAGS = -no-install ratbag_command_CFLAGS = $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) hidpp10_dump_page_SOURCES = hidpp10-dump-page.c -hidpp10_dump_page_LDADD = ../src/libhidpp10.la +hidpp10_dump_page_LDADD = ../src/libhidpp.la hidpp10_dump_page_LDFLAGS = -no-install hidpp10_dump_page_CFLAGS = -I$(top_srcdir)/src hidpp20_dump_page_SOURCES = hidpp20-dump-page.c -hidpp20_dump_page_LDADD = ../src/libhidpp20.la +hidpp20_dump_page_LDADD = ../src/libhidpp.la hidpp20_dump_page_LDFLAGS = -no-install hidpp20_dump_page_CFLAGS = -I$(top_srcdir)/src