Disable some stuff which should not be in 0.2.

Disable decoders, disable lib building.

diff --git a/Makefile.am b/Makefile.am
index 8095ff2cd4d6352a9b3b6c76a34f21f4e398ffad..df0e9de48c570ff49bd829381ba3e53e623c4148 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
 
 SUBDIRS = hardware input output firmware
 
-lib_LTLIBRARIES = libsigrok.la
+# lib_LTLIBRARIES = libsigrok.la
+noinst_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
        backend.c \
@@ -42,9 +43,10 @@ libsigrok_la_LIBADD = \
 
 libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
 
-include_HEADERS = sigrok.h sigrok-proto.h
-noinst_HEADERS = sigrok-internal.h
+# include_HEADERS = sigrok.h sigrok-proto.h
+# noinst_HEADERS = sigrok-internal.h
+noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libsigrok.pc
+# pkgconfigdir = $(libdir)/pkgconfig
+# pkgconfig_DATA = libsigrok.pc
 

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 5205c188e6b785beeac473ff3e6db9dc0b38b0cc..b3e8af0f76144f40f1528aee6ab3b7acddd06532 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -243,9 +243,11 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
        case 115200:
                baud = B115200;
                break;
+#if 0
        case 460800:
                baud = B460800;
                break;
+#endif
        default:
                return SR_ERR;
        }