X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=134896270c110eed95751abbd6e74ac5ae1c51c9;hb=f227338297de002d8a76dc5e411dde8743751028;hp=808a236961bfa2006b13db6acbaeedc5077dcd39;hpb=27d44cf6e0eaaa75979510596d6148193a8434c0;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 808a2369..13489627 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,6 +179,12 @@ libsigrok_la_SOURCES += \
 	src/hardware/appa-55ii/protocol.c \
 	src/hardware/appa-55ii/api.c
 endif
+if HW_ARACHNID_LABS_RE_LOAD_PRO
+libsigrok_la_SOURCES += \
+	src/hardware/arachnid-labs-re-load-pro/protocol.h \
+	src/hardware/arachnid-labs-re-load-pro/protocol.c \
+	src/hardware/arachnid-labs-re-load-pro/api.c
+endif
 if HW_ASIX_SIGMA
 libsigrok_la_SOURCES += \
 	src/hardware/asix-sigma/protocol.h \
@@ -263,6 +269,12 @@ libsigrok_la_SOURCES += \
 	src/hardware/fluke-dmm/fluke.c \
 	src/hardware/fluke-dmm/api.c
 endif
+if HW_FTDI_LA
+libsigrok_la_SOURCES += \
+	src/hardware/ftdi-la/protocol.h \
+	src/hardware/ftdi-la/protocol.c \
+	src/hardware/ftdi-la/api.c
+endif
 if HW_FX2LAFW
 libsigrok_la_SOURCES += \
 	src/hardware/fx2lafw/protocol.h \
@@ -289,12 +301,24 @@ libsigrok_la_SOURCES += \
 	src/hardware/hameg-hmo/protocol.c \
 	src/hardware/hameg-hmo/api.c
 endif
+if HW_HANTEK_6XXX
+libsigrok_la_SOURCES += \
+	src/hardware/hantek-6xxx/protocol.h \
+	src/hardware/hantek-6xxx/protocol.c \
+	src/hardware/hantek-6xxx/api.c
+endif
 if HW_HANTEK_DSO
 libsigrok_la_SOURCES += \
 	src/hardware/hantek-dso/dso.h \
 	src/hardware/hantek-dso/dso.c \
 	src/hardware/hantek-dso/api.c
 endif
+if HW_HP_3457A
+libsigrok_la_SOURCES += \
+	src/hardware/hp-3457a/protocol.h \
+	src/hardware/hp-3457a/protocol.c \
+	src/hardware/hp-3457a/api.c
+endif
 if HW_HUNG_CHANG_DSO_2100
 libsigrok_la_SOURCES += \
 	src/hardware/hung-chang-dso-2100/protocol.h \
@@ -660,7 +684,7 @@ RDIR = bindings/ruby
 RDOC = $(RDIR)/doc.i
 RWRAP = $(RDIR)/classes_wrap.cpp
 ROBJ = $(RWRAP:.cpp=.o)
-REXT = $(RDIR)/sigrok.so
+REXT = $(RDIR)/sigrok.$(RUBY_DLEXT)
 
 $(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) > $@
@@ -683,8 +707,8 @@ $(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la
 ruby-build: $(REXT)
 
 ruby-install: $(REXT)
-	$(INSTALL) -d $(prefix)/$(RBSIGROK_EXTDIR)
-	$(INSTALL) $< $(prefix)/$(RBSIGROK_EXTDIR)
+	$(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
+	$(INSTALL) $< $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
 
 ruby-clean:
 	-$(AM_V_at)rm -fr $(RDIR)/doc