X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=16dd83abbb270cb7d5294576ee0e0c7c4b68b60e;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=7f0cab112a38572fa11e2ff2f9a343f963778437;hpb=aea4e458485559ffb7999ecbda0ed349c7d8edb7;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 7f0cab11..16dd83ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ libsigrok_la_SOURCES = \
 	src/session.c \
 	src/session_file.c \
 	src/session_driver.c \
-	src/drivers.c \
 	src/hwdriver.c \
 	src/trigger.c \
 	src/soft-trigger.c \
@@ -168,6 +167,10 @@ libsigrok_la_SOURCES += \
 	src/scale/kern.c
 
 # Hardware drivers
+
+# This entry must be placed before all drivers
+libsigrok_la_SOURCES += src/hardware/driver_list_start.c
+
 if HW_AGILENT_DMM
 libsigrok_la_SOURCES += \
 	src/hardware/agilent-dmm/api.c \
@@ -500,6 +503,9 @@ libsigrok_la_SOURCES += \
 	src/hardware/zeroplus-logic-cube/api.c
 endif
 
+# This entry must be placed after all drivers
+libsigrok_la_SOURCES += src/hardware/driver_list_end.c
+
 libsigrok_la_LIBADD = $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
 libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
 
@@ -530,6 +536,7 @@ EXTRA_DIST = \
 	bindings/python/sigrok/__init__.py \
 	bindings/python/sigrok/core/__init__.py \
 	bindings/python/sigrok/core/classes.i \
+	bindings/ruby/classes.i \
 	bindings/java/Doxyfile \
 	bindings/java/org/sigrok/core/classes/classes.i \
 	bindings/java/org/sigrok/core/interfaces/DatafeedCallback.java \
@@ -688,22 +695,23 @@ ROBJ = $(RWRAP:.cpp=.o)
 REXT = $(RDIR)/sigrok.$(RUBY_DLEXT)
 
 $(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+	$(AM_V_at)test -d $(RDIR) || $(MKDIR_P) $(RDIR)
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) > $@
 
 $(RWRAP): $(RDIR)/classes.i $(RDOC) \
 		bindings/swig/classes.i bindings/swig/templates.i \
 		bindings/swig/enums.i
-	$(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include $(swig_defs) -o $@ $<
+	$(AM_V_GEN)$(SWIG) -ruby -c++ -Ibindings -Ibindings/cxx/include -I$(RDIR) $(local_includes) $(swig_defs) -o $@ $<
 
 $(ROBJ): $(RWRAP) \
 		$(library_include_HEADERS) \
 		$(nodist_library_include_HEADERS) \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS)
-	$(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include -fPIC -o $@ -c $<
+	$(AM_V_CXX)$(CXX) $(RBSIGROK_CFLAGS) -I. -Iinclude -Ibindings/cxx/include $(local_includes) -fPIC -o $@ -c $<
 
 $(REXT): $(ROBJ) @ORDER@ bindings/cxx/libsigrokcxx.la
-	$(AM_V_CXXLD)$(CXX) -shared -std=c++11 -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
+	$(AM_V_CXXLD)$(CXX) -shared -o $@ $< -lsigrokcxx -Lbindings/cxx/.libs $(RBSIGROK_LIBS)
 
 ruby-build: $(REXT)
 
@@ -711,15 +719,19 @@ ruby-install: $(REXT)
 	$(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
 	$(INSTALL) $< $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)
 
+ruby-uninstall:
+	rm -f $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)/sigrok.$(RUBY_DLEXT)
+
 ruby-clean:
 	-$(AM_V_at)rm -fr $(RDIR)/doc
-	-$(AM_V_at)rm $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
+	-$(AM_V_at)rm -f $(REXT) $(ROBJ) $(RWRAP) $(RDOC)
 
 ruby-doc: $(RWRAP)
 	$(AM_V_at)yard doc -o $(RDIR)/doc $<
 
 BUILD_EXTRA += ruby-build
 INSTALL_EXTRA += ruby-install
+UNINSTALL_EXTRA += ruby-uninstall
 CLEAN_EXTRA += ruby-clean
 
 endif