summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2011-01-20 00:39:59 +0100
committerUwe Hermann <uwe@hermann-uwe.de>2011-01-20 00:43:57 +0100
commit81c9bc4448af804376f86cb3373ced99414071a9 (patch)
tree31fb423fb50336c8ccbebccd6873a8b7eeda5d57 /Makefile.am
parent17891ce2b00e2bea78f66c56a141ae8512a838df (diff)
downloadlibsigrokdecode-81c9bc4448af804376f86cb3373ced99414071a9.tar.gz
libsigrokdecode-81c9bc4448af804376f86cb3373ced99414071a9.zip
Re-enable stuff we temporarily disabled for 0.1.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am12
1 files changed, 5 insertions, 7 deletions
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