Use consistent naming for internal libtool helper libs.

This now also matches what the 'new-driver' tool generates.

hardware/Makefile.am

@@ -47,18 +47,18 @@ noinst_LTLIBRARIES = libsigrokhardware.la
 libsigrokhardware_la_SOURCES =
 
 libsigrokhardware_la_LIBADD = \
-	common/libsigrokhwcommon.la
+	common/libsigrok_hw_common.la
 
 if HW_AGILENT_DMM
-libsigrokhardware_la_LIBADD += agilent-dmm/libsigrokhwagilentdmm.la
+libsigrokhardware_la_LIBADD += agilent-dmm/libsigrok_hw_agilent_dmm.la
 endif
 
 if HW_ALSA
-libsigrokhardware_la_LIBADD += alsa/libsigrokhwalsa.la
+libsigrokhardware_la_LIBADD += alsa/libsigrok_hw_alsa.la
 endif
 
 if HW_ASIX_SIGMA
-libsigrokhardware_la_LIBADD += asix-sigma/libsigrokhwasixsigma.la
+libsigrokhardware_la_LIBADD += asix-sigma/libsigrok_hw_asix_sigma.la
 endif
 
 if HW_BRYMEN_DMM
@@ -66,7 +66,7 @@ libsigrokhardware_la_LIBADD += brymen-dmm/libsigrok_hw_brymen_dmm.la
 endif
 
 if HW_CHRONOVU_LA8
-libsigrokhardware_la_LIBADD += chronovu-la8/libsigrokhwchronovula8.la
+libsigrokhardware_la_LIBADD += chronovu-la8/libsigrok_hw_chronovu_la8.la
 endif
 
 if HW_COLEAD_SLM
@@ -74,19 +74,19 @@ libsigrokhardware_la_LIBADD += colead-slm/libsigrok_hw_colead_slm.la
 endif
 
 if HW_DEMO
-libsigrokhardware_la_LIBADD += demo/libsigrokhwdemo.la
+libsigrokhardware_la_LIBADD += demo/libsigrok_hw_demo.la
 endif
 
 if HW_FLUKE_DMM
-libsigrokhardware_la_LIBADD += fluke-dmm/libsigrokhwflukedmm.la
+libsigrokhardware_la_LIBADD += fluke-dmm/libsigrok_hw_fluke_dmm.la
 endif
 
 if HW_FX2LAFW
-libsigrokhardware_la_LIBADD += fx2lafw/libsigrokhwfx2lafw.la
+libsigrokhardware_la_LIBADD += fx2lafw/libsigrok_hw_fx2lafw.la
 endif
 
 if HW_HANTEK_DSO
-libsigrokhardware_la_LIBADD += hantek-dso/libsigrokhw_hantek_dso.la
+libsigrokhardware_la_LIBADD += hantek-dso/libsigrok_hw_hantek_dso.la
 endif
 
 if HW_LASCAR_EL_USB
@@ -94,7 +94,7 @@ libsigrokhardware_la_LIBADD += lascar-el-usb/libsigrok_hw_lascar_el_usb.la
 endif
 
 if HW_LINK_MSO19
-libsigrokhardware_la_LIBADD += link-mso19/libsigrokhwlinkmso19.la
+libsigrokhardware_la_LIBADD += link-mso19/libsigrok_hw_link_mso_19.la
 endif
 
 if HW_MIC_985XX
@@ -106,7 +106,7 @@ libsigrokhardware_la_LIBADD += nexus-osciprime/libsigrok_hw_nexus_osciprime.la
 endif
 
 if HW_OLS
-libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrokhwols.la
+libsigrokhardware_la_LIBADD += openbench-logic-sniffer/libsigrok_hw_ols.la
 endif
 
 if HW_RIGOL_DS1XX2
@@ -114,7 +114,7 @@ libsigrokhardware_la_LIBADD += rigol-ds1xx2/libsigrok_hw_rigol_ds1xx2.la
 endif
 
 if HW_SERIAL_DMM
-libsigrokhardware_la_LIBADD += serial-dmm/libsigrokhwserialdmm.la
+libsigrokhardware_la_LIBADD += serial-dmm/libsigrok_hw_serial_dmm.la
 endif
 
 if HW_TONDAJ_SL_814
@@ -130,6 +130,6 @@ libsigrokhardware_la_LIBADD += victor-dmm/libsigrok_hw_victor_dmm.la
 endif
 
 if HW_ZEROPLUS_LOGIC_CUBE
-libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrokhwzeroplus.la
+libsigrokhardware_la_LIBADD += zeroplus-logic-cube/libsigrok_hw_zeroplus.la
 endif
 

hardware/agilent-dmm/Makefile.am

@@ -20,14 +20,14 @@
 if HW_AGILENT_DMM
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwagilentdmm.la
+noinst_LTLIBRARIES = libsigrok_hw_agilent_dmm.la
 
-libsigrokhwagilentdmm_la_SOURCES = \
+libsigrok_hw_agilent_dmm_la_SOURCES = \
 	api.c \
 	agilent-dmm.h \
 	sched.c
 
-libsigrokhwagilentdmm_la_CFLAGS = \
+libsigrok_hw_agilent_dmm_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/alsa/Makefile.am

@@ -20,14 +20,14 @@
 if HW_ALSA
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwalsa.la
+noinst_LTLIBRARIES = libsigrok_hw_alsa.la
 
-libsigrokhwalsa_la_SOURCES = \
+libsigrok_hw_alsa_la_SOURCES = \
 	protocol.h \
 	protocol.c \
 	api.c
 
-libsigrokhwalsa_la_CFLAGS = \
+libsigrok_hw_alsa_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/asix-sigma/Makefile.am

@@ -22,13 +22,13 @@ if HW_ASIX_SIGMA
 AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwasixsigma.la
+noinst_LTLIBRARIES = libsigrok_hw_asix_sigma.la
 
-libsigrokhwasixsigma_la_SOURCES = \
+libsigrok_hw_asix_sigma_la_SOURCES = \
 	asix-sigma.c \
 	asix-sigma.h
 
-libsigrokhwasixsigma_la_CFLAGS = \
+libsigrok_hw_asix_sigma_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/chronovu-la8/Makefile.am

@@ -21,14 +21,14 @@
 if HW_CHRONOVU_LA8
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwchronovula8.la
+noinst_LTLIBRARIES = libsigrok_hw_chronovu_la8.la
 
-libsigrokhwchronovula8_la_SOURCES = \
+libsigrok_hw_chronovu_la8_la_SOURCES = \
 	api.c \
 	protocol.c \
 	protocol.h
 
-libsigrokhwchronovula8_la_CFLAGS = \
+libsigrok_hw_chronovu_la8_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/common/Makefile.am

@@ -20,16 +20,16 @@
 SUBDIRS = dmm
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwcommon.la
+noinst_LTLIBRARIES = libsigrok_hw_common.la
 
-libsigrokhwcommon_la_SOURCES = serial.c
+libsigrok_hw_common_la_SOURCES = serial.c
 
 if NEED_USB
-libsigrokhwcommon_la_SOURCES += ezusb.c usb.c
+libsigrok_hw_common_la_SOURCES += ezusb.c usb.c
 endif
 
-libsigrokhwcommon_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
+libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la
 
-libsigrokhwcommon_la_CFLAGS = \
+libsigrok_hw_common_la_CFLAGS = \
 	-I$(top_srcdir)
 

hardware/demo/Makefile.am

@@ -20,12 +20,12 @@
 if HW_DEMO
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwdemo.la
+noinst_LTLIBRARIES = libsigrok_hw_demo.la
 
-libsigrokhwdemo_la_SOURCES = \
+libsigrok_hw_demo_la_SOURCES = \
 	demo.c
 
-libsigrokhwdemo_la_CFLAGS = \
+libsigrok_hw_demo_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/fluke-dmm/Makefile.am

@@ -20,14 +20,14 @@
 if HW_FLUKE_DMM
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwflukedmm.la
+noinst_LTLIBRARIES = libsigrok_hw_fluke_dmm.la
 
-libsigrokhwflukedmm_la_SOURCES = \
+libsigrok_hw_fluke_dmm_la_SOURCES = \
 	api.c \
 	fluke.c \
 	fluke-dmm.h
 
-libsigrokhwflukedmm_la_CFLAGS = \
+libsigrok_hw_fluke_dmm_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/fx2lafw/Makefile.am

@@ -22,15 +22,15 @@ if HW_FX2LAFW
 AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwfx2lafw.la
+noinst_LTLIBRARIES = libsigrok_hw_fx2lafw.la
 
-libsigrokhwfx2lafw_la_SOURCES = \
+libsigrok_hw_fx2lafw_la_SOURCES = \
 	command.c \
 	command.h \
 	fx2lafw.c \
 	fx2lafw.h
 
-libsigrokhwfx2lafw_la_CFLAGS = \
+libsigrok_hw_fx2lafw_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/hantek-dso/Makefile.am

@@ -22,14 +22,14 @@ if HW_HANTEK_DSO
 AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhw_hantek_dso.la
+noinst_LTLIBRARIES = libsigrok_hw_hantek_dso.la
 
-libsigrokhw_hantek_dso_la_SOURCES = \
+libsigrok_hw_hantek_dso_la_SOURCES = \
 	api.c \
 	dso.c \
 	dso.h
 
-libsigrokhw_hantek_dso_la_CFLAGS = \
+libsigrok_hw_hantek_dso_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/link-mso19/Makefile.am

@@ -20,15 +20,14 @@
 if HW_LINK_MSO19
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwlinkmso19.la
+noinst_LTLIBRARIES = libsigrok_hw_link_mso_19.la
 
-libsigrokhwlinkmso19_la_SOURCES = \
+libsigrok_hw_link_mso_19_la_SOURCES = \
 	api.c \
 	protocol.c \
 	protocol.h 
-#link-mso19.c 
 
-libsigrokhwlinkmso19_la_CFLAGS = \
+libsigrok_hw_link_mso_19_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/openbench-logic-sniffer/Makefile.am

@@ -20,14 +20,14 @@
 if HW_OLS
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwols.la
+noinst_LTLIBRARIES = libsigrok_hw_ols.la
 
-libsigrokhwols_la_SOURCES = \
+libsigrok_hw_ols_la_SOURCES = \
 	api.c \
 	protocol.c \
 	protocol.h
 
-libsigrokhwols_la_CFLAGS = \
+libsigrok_hw_ols_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/serial-dmm/Makefile.am

@@ -20,14 +20,14 @@
 if HW_SERIAL_DMM
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwserialdmm.la
+noinst_LTLIBRARIES = libsigrok_hw_serial_dmm.la
 
-libsigrokhwserialdmm_la_SOURCES = \
+libsigrok_hw_serial_dmm_la_SOURCES = \
 	api.c \
 	protocol.c \
 	protocol.h
 
-libsigrokhwserialdmm_la_CFLAGS = \
+libsigrok_hw_serial_dmm_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif

hardware/zeroplus-logic-cube/Makefile.am

@@ -20,9 +20,9 @@
 if HW_ZEROPLUS_LOGIC_CUBE
 
 # Local lib, this is NOT meant to be installed!
-noinst_LTLIBRARIES = libsigrokhwzeroplus.la
+noinst_LTLIBRARIES = libsigrok_hw_zeroplus.la
 
-libsigrokhwzeroplus_la_SOURCES = \
+libsigrok_hw_zeroplus_la_SOURCES = \
 	api.c \
 	protocol.c \
 	protocol.h \
@@ -31,7 +31,7 @@ libsigrokhwzeroplus_la_SOURCES = \
 	gl_usb.c \
 	gl_usb.h
 
-libsigrokhwzeroplus_la_CFLAGS = \
+libsigrok_hw_zeroplus_la_CFLAGS = \
 	-I$(top_srcdir)
 
 endif