From: Uwe Hermann <redacted>
Date: Sun, 3 Apr 2011 21:18:46 +0000 (+0200)
Subject: Revert temporary changes for 0.2 release.
X-Git-Tag: libsigrok-0.1.0~299
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=8a7b47cdfae4a4a95e92958beab41a4985e8f8e3

Revert temporary changes for 0.2 release.
---

diff --git a/Makefile.am b/Makefile.am
index df0e9de4..8095ff2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index b3e8af0f..5205c188 100644
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -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;
 	}