X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=df0e9de48c570ff49bd829381ba3e53e623c4148;hb=2f3aab0ee9797700238656218208a6ab17a607b3;hp=4d532e0c6ab5ea72c4f5bd8b696165ee7406f49d;hpb=882e2075bb51496e5eb9548b98204b90a4b60a82;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 4d532e0c..df0e9de4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,20 +17,23 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \
-	      -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
 
-SUBDIRS = hardware input output
+SUBDIRS = hardware input output firmware
 
-lib_LTLIBRARIES = libsigrok.la
+# lib_LTLIBRARIES = libsigrok.la
+noinst_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
 
 libsigrok_la_LIBADD = \
 	$(LIBOBJS) \
@@ -38,8 +41,12 @@ libsigrok_la_LIBADD = \
 	input/libsigrokinput.la \
 	output/libsigrokoutput.la
 
-include_HEADERS = sigrok.h sigrok-proto.h
+libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libsigrok.pc
+# include_HEADERS = sigrok.h sigrok-proto.h
+# noinst_HEADERS = sigrok-internal.h
+noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
+
+# pkgconfigdir = $(libdir)/pkgconfig
+# pkgconfig_DATA = libsigrok.pc