Revert temporary changes for 0.2 release.

diff --git a/Makefile.am b/Makefile.am
index ac659aaa5626f3ccf9d629362f2b2c1520381e46..e6d0710771136a38e1c3687abf7d7f9cf334715f 100644 (file)
--- 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
 
@@ -30,9 +29,8 @@ libsigrokdecode_la_CPPFLAGS = $(CPPFLAGS_PYTHON) \
 libsigrokdecode_la_LDFLAGS = $(SIGROKDECODE_LT_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