input/raw_analog: Prevent "duplicate const decl specifier" warning

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 808a236961bfa2006b13db6acbaeedc5077dcd39..4416ae5f1127cc2c4987926bad4d4c7df9dd6995 100644 (file)
--- 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 \
@@ -289,6 +295,12 @@ 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 \
@@ -660,7 +672,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 +695,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