Revert temporary changes for 0.2 release.
This commit is contained in:
parent
2f3aab0ee9
commit
8a7b47cdfa
12
Makefile.am
12
Makefile.am
|
@ -21,8 +21,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
|
||||||
|
|
||||||
SUBDIRS = hardware input output firmware
|
SUBDIRS = hardware input output firmware
|
||||||
|
|
||||||
# lib_LTLIBRARIES = libsigrok.la
|
lib_LTLIBRARIES = libsigrok.la
|
||||||
noinst_LTLIBRARIES = libsigrok.la
|
|
||||||
|
|
||||||
libsigrok_la_SOURCES = \
|
libsigrok_la_SOURCES = \
|
||||||
backend.c \
|
backend.c \
|
||||||
|
@ -43,10 +42,9 @@ libsigrok_la_LIBADD = \
|
||||||
|
|
||||||
libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
|
libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
|
||||||
|
|
||||||
# include_HEADERS = sigrok.h sigrok-proto.h
|
include_HEADERS = sigrok.h sigrok-proto.h
|
||||||
# noinst_HEADERS = sigrok-internal.h
|
noinst_HEADERS = sigrok-internal.h
|
||||||
noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
|
|
||||||
|
|
||||||
# pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
# pkgconfig_DATA = libsigrok.pc
|
pkgconfig_DATA = libsigrok.pc
|
||||||
|
|
||||||
|
|
|
@ -243,11 +243,9 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits,
|
||||||
case 115200:
|
case 115200:
|
||||||
baud = B115200;
|
baud = B115200;
|
||||||
break;
|
break;
|
||||||
#if 0
|
|
||||||
case 460800:
|
case 460800:
|
||||||
baud = B460800;
|
baud = B460800;
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
default:
|
default:
|
||||||
return SR_ERR;
|
return SR_ERR;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue