X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=3b0ed715c861e4e384b4968c57e2f6238f741cce;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=372640ee646fd3b38a7f3fcbefddadf56995ad6a;hpb=c70fce6ba6f061f1fbd4dbdf08e5d2ffa0168f6a;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 372640ee..3b0ed715 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,21 +17,25 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \
-	      -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = hardware input output
+AM_CPPFLAGS = -I$(top_srcdir)
 
-# lib_LTLIBRARIES = libsigrok.la
-noinst_LTLIBRARIES = libsigrok.la
+SUBDIRS = contrib hardware input output firmware
+
+lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
 	backend.c \
 	datastore.c \
 	device.c \
 	session.c \
+	session_file.c \
+	session_driver.c \
 	hwplugin.c \
-	filter.c
+	filter.c \
+	strutil.c \
+	log.c
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -39,10 +43,13 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
-# include_HEADERS = sigrok.h sigrok-proto.h
-# noinst_HEADERS = sigrok-internal.h
-noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
+libsigrok_la_LDFLAGS = $(LIBSIGROK_LT_LDFLAGS)
+
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libsigrok.pc
+EXTRA_DIST = Doxyfile