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

diff --git a/Makefile.am b/Makefile.am
index 85f880e3..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
 
@@ -705,7 +711,7 @@ $(ROBJ): $(RWRAP) \
 	$(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)