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

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 372640ee646fd3b38a7f3fcbefddadf56995ad6a..24e88d8c63e43f7f5dacd224fa5654944f8b480c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 m4
 
-SUBDIRS = hardware input output
+AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
 
-# 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,11 @@ 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 = $(SIGROK_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