From: Uwe Hermann <redacted>
Date: Wed, 19 Jan 2011 23:39:59 +0000 (+0100)
Subject: Re-enable stuff we temporarily disabled for 0.1.
X-Git-Tag: libsigrokdecode-0.1.0~309
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=81c9bc4448af804376f86cb3373ced99414071a9

Re-enable stuff we temporarily disabled for 0.1.
---

diff --git a/Makefile.am b/Makefile.am
index f5cdb8b..6ae808f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,9 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-# SUBDIRS = decoders
+SUBDIRS = decoders
 
-# lib_LTLIBRARIES = libsigrokdecode.la
-noinst_LTLIBRARIES = libsigrokdecode.la
+lib_LTLIBRARIES = libsigrokdecode.la
 
 libsigrokdecode_la_SOURCES = decode.c
 
@@ -29,9 +28,8 @@ libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
 			      -DDECODERS_DIR='"$(DECODERS_DIR)"'
 libsigrokdecode_la_LDFLAGS = $(LDFLAGS_PYTHON)
 
-# include_HEADERS = sigrokdecode.h
-noinst_HEADERS = sigrokdecode.h
+include_HEADERS = sigrokdecode.h
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libsigrokdecode.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrokdecode.pc