sr/srd: Move some files to their resp. dirs.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 94672f333618981728d3ecabb875824497b71356..24e88d8c63e43f7f5dacd224fa5654944f8b480c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,11 @@
 ## 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 m4
 
-SUBDIRS = hardware input output
+AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
+
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -29,8 +30,12 @@ libsigrok_la_SOURCES = \
        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) \
@@ -38,6 +43,8 @@ libsigrok_la_LIBADD = \
        input/libsigrokinput.la \
        output/libsigrokoutput.la
 
+libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
+
 include_HEADERS = sigrok.h sigrok-proto.h
 noinst_HEADERS = sigrok-internal.h