summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2011-04-03 23:18:46 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2011-04-03 23:18:46 +0200
commitf7b07643a758affd60c8ff0f6b1661faf9e5d5f7 (patch)
tree5b7d7f09b446636e03f81c519cb696eb531864a3
parenta5ec180ff8b7d91d4b96b4e7469424622dfe9234 (diff)
downloadlibsigrokdecode-f7b07643a758affd60c8ff0f6b1661faf9e5d5f7.tar.gz
libsigrokdecode-f7b07643a758affd60c8ff0f6b1661faf9e5d5f7.zip
Revert temporary changes for 0.2 release.
-rw-r--r--Makefile.am12
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index ac659aa..e6d0710 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
@@ -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