X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=Makefile.am;h=e0bf75f9ac05c10318058a3d11173298a20dafdf;hb=1190dcf713a458d99c612f8f41c2d28e666aabfb;hp=b9e0c0745b6cf1778b619efcaca1e78a09687732;hpb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index b9e0c074..e0bf75f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,11 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
+ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = hardware input output firmware
+AM_CPPFLAGS = -I$(top_srcdir)
+
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -41,7 +43,7 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
-libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
+libsigrok_la_LDFLAGS = $(LIBSIGROK_LT_LDFLAGS)
 
 include_HEADERS = sigrok.h sigrok-proto.h
 noinst_HEADERS = sigrok-internal.h
@@ -49,3 +51,5 @@ noinst_HEADERS = sigrok-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
+EXTRA_DIST = Doxyfile
+