BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert temporary changes for 0.2 release.

This commit is contained in:
Uwe Hermann 2011-04-03 23:18:46 +02:00
parent 2f3aab0ee9
commit 8a7b47cdfa
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

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

2
hardware/common/serial.c
View File

@ -243,11 +243,9 @@ 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;
}