]> sigrok.org Git - libsigrok.git/commitdiff
Use consistent naming for internal libtool helper libs.
authorUwe Hermann <redacted>
Wed, 8 May 2013 17:49:23 +0000 (19:49 +0200)
committerUwe Hermann <redacted>
Fri, 10 May 2013 15:44:01 +0000 (17:44 +0200)
This now also matches what the 'new-driver' tool generates.

14 files changed:
hardware/Makefile.am
hardware/agilent-dmm/Makefile.am
hardware/alsa/Makefile.am
hardware/asix-sigma/Makefile.am
hardware/chronovu-la8/Makefile.am
hardware/common/Makefile.am
hardware/demo/Makefile.am
hardware/fluke-dmm/Makefile.am
hardware/fx2lafw/Makefile.am
hardware/hantek-dso/Makefile.am
hardware/link-mso19/Makefile.am
hardware/openbench-logic-sniffer/Makefile.am
hardware/serial-dmm/Makefile.am
hardware/zeroplus-logic-cube/Makefile.am

index 0dd08e04518dcdfb24cc2f99248676c9084dc1a3..8bc8fd62bc9c3faa389291982fbae16f80918d99 100644 (file)
@@ -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
 
index cb998f5ef8bbc1aaee5d2909480530e3248c6ad0..2702d6bbe217fe6b1e0bfbdd04cbf588928ec236 100644 (file)
 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
index 5bacb5b0786dc3ad8187940e825e00352c6bcdff..df9d88b74d92dce40aa099f3a08833194044f5d5 100644 (file)
 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
index 195709d3354346ced38834c850b1750bd52e122c..f7b1b23b3f222225cb78ffc04b4a3c2a1eaa6e66 100644 (file)
@@ -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
index ab364ee18458d1448cc639b06441ad7e6b53d022..1ecfe819a41bf47306c8ef2ca6a59c2b38685b7c 100644 (file)
 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
index d6da68b0727fc3a5998b230848f378061fbef567..ca717510d5fb0796f95b5cd5c561cd9ba0549e44 100644 (file)
 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)
 
index fe42170fcd7a4b7b4f39f4445f107ca8cac7897b..a145d9d83daadef568583dacf9c7b1507d8084c9 100644 (file)
 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
index 8f110a5437e507c74209219a6c7990beaae35729..fc6a753f95485e02877f1811b24097be11191ec5 100644 (file)
 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
index a8a0c38931000aa2255fce23722ea8b9ae5bf5bd..75424b1682bb046dbf507b5fc9aa5804d5b949bf 100644 (file)
@@ -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
index 6ce452f5076d7f34afd03e110e507f9443636283..f890ae261fd4696020308841f91f32872595ae43 100644 (file)
@@ -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
index a2d4d0076311dc456a68d4b6d440dc8d1ae25601..01ebd3cc6221c616d5fa1a2b5c04439beba30434 100644 (file)
 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
index c54130058b6294993f5495f2c49d5aae0d60dd74..c9af79df654e39a7009efbb160cddde9ca75b170 100644 (file)
 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
index 53013f29ad189fae6638cb83c28bda1086fdd06f..a0355d80e665010c3e6de6c9cb5583959b422ae0 100644 (file)
 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
index b47a1386a437e9d4ce79883dd15414b178f06776..d3bc2d96619a5b0c3b65faff2627ce51878c3bfa 100644 (file)
@@ -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