X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=ae85f48c207ee4da2aa221ec8dbf5956c4bf83f9;hb=4abf8dd0a540db8c8f5af5e6bd78c6eb7b473d9f;hp=193cccf2d71497ef02dfba8bc219f0500d831044;hpb=28a35d8ab35483b6d50e5b8404542cc11875fa5d;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 193cccf2..ae85f48c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +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 autostuff
+
+AM_CPPFLAGS = -I$(top_srcdir)
+
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -27,27 +30,24 @@ libsigrok_la_SOURCES = \
 	datastore.c \
 	device.c \
 	session.c \
+	session_file.c \
+	session_driver.c \
 	hwplugin.c \
 	filter.c \
-	hardware/common/ezusb.c \
-	hardware/common/serial.c \
-	hardware/openbench-logic-sniffer/ols.c \
-	hardware/saleae-logic/saleae-logic.c \
-	hardware/asix-sigma/asix-sigma.c \
-	hardware/asix-sigma/asix-sigma.h \
-	hardware/zeroplus-logic-cube/analyzer.c \
-	hardware/zeroplus-logic-cube/analyzer.h \
-	hardware/zeroplus-logic-cube/gl_usb.c \
-	hardware/zeroplus-logic-cube/gl_usb.h \
-	hardware/zeroplus-logic-cube/zeroplus.c \
-	output/output_binary.c \
-	output/output_text.c \
-	output/output_vcd.c \
-	output/output_gnuplot.c \
-	output/common.c \
-	output/output.c
-
-libsigrok_la_LIBADD = $(LIBOBJS)
-
-include_HEADERS = sigrok.h
+	strutil.c \
+	log.c
+
+libsigrok_la_LIBADD = \
+	$(LIBOBJS) \
+	hardware/libsigrokhardware.la \
+	input/libsigrokinput.la \
+	output/libsigrokoutput.la
+
+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