X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=7d22a60f47dd9f494d51ed33a830778e2fcc3392;hb=ba508e22d4e5ac358489e24b29f458c5bc1fb892;hp=69bb447347046123b96e6ab5afac7a0f27274c45;hpb=5d8b3913d4dc450b8af0ad028a379be775e278ef;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 69bb4473..7d22a60f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,6 @@ libsigrok_la_SOURCES += \
 	src/output/csv.c \
 	src/output/chronovu_la8.c \
 	src/output/wav.c \
-	src/output/gnuplot.c \
 	src/output/hex.c \
 	src/output/ols.c \
 	src/output/srzip.c \
@@ -180,9 +179,9 @@ src_libdrivers_la_SOURCES = src/drivers.c
 
 if HW_AGILENT_DMM
 src_libdrivers_la_SOURCES += \
-	src/hardware/agilent-dmm/api.c \
-	src/hardware/agilent-dmm/agilent-dmm.h \
-	src/hardware/agilent-dmm/sched.c
+	src/hardware/agilent-dmm/protocol.h \
+	src/hardware/agilent-dmm/protocol.c \
+	src/hardware/agilent-dmm/api.c
 endif
 if HW_APPA_55II
 src_libdrivers_la_SOURCES += \
@@ -268,7 +267,9 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_DEMO
 src_libdrivers_la_SOURCES += \
-	src/hardware/demo/demo.c
+	src/hardware/demo/protocol.h \
+	src/hardware/demo/protocol.c \
+	src/hardware/demo/api.c
 endif
 if HW_DEREE_DE5000
 src_libdrivers_la_SOURCES += \
@@ -276,8 +277,8 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_FLUKE_DMM
 src_libdrivers_la_SOURCES += \
-	src/hardware/fluke-dmm/fluke-dmm.h \
-	src/hardware/fluke-dmm/fluke.c \
+	src/hardware/fluke-dmm/protocol.h \
+	src/hardware/fluke-dmm/protocol.c \
 	src/hardware/fluke-dmm/api.c
 endif
 if HW_FTDI_LA
@@ -320,8 +321,8 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_HANTEK_DSO
 src_libdrivers_la_SOURCES += \
-	src/hardware/hantek-dso/dso.h \
-	src/hardware/hantek-dso/dso.c \
+	src/hardware/hantek-dso/protocol.h \
+	src/hardware/hantek-dso/protocol.c \
 	src/hardware/hantek-dso/api.c
 endif
 if HW_HP_3457A
@@ -554,11 +555,6 @@ EXTRA_DIST = \
 	bindings/swig/classes.i \
 	bindings/swig/doc.py \
 	bindings/swig/templates.i \
-	contrib/gnuplot_chronovu_la8.gpi \
-	contrib/gnuplot_rigol_ds1xx2.gpi \
-	contrib/gnuplot_usbeesx.gpi \
-	contrib/gnuplot_usbeedx8.gpi \
-	contrib/gnuplot_usbeedx16.gpi \
 	contrib/sigrok-logo-notext.png \
 	contrib/z60_libsigrok.rules