X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8095ff2cd4d6352a9b3b6c76a34f21f4e398ffad;hb=77b454421a2aa7d52873f036e5ba5f8030fe29a3;hp=85dfe41c009fb5213bd4b915c9b497db30b11261;hpb=6239c175c1b967b577f760032d326322dd4c4576;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 85dfe41c..8095ff2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,9 @@
 ## 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 firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -27,62 +28,22 @@ 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/misc.c \
-	hardware/common/serial.c \
-	hardware/demo/demo.c \
-	input/input_binary.c \
-	input/input.c \
-	output/output_binary.c \
-	output/output_text.c \
-	output/output_vcd.c \
-	output/output_gnuplot.c \
-	output/common.c \
-	output/output.c
-
-if LA_ASIX_SIGMA
-libsigrok_la_SOURCES += \
-	hardware/asix-sigma/asix-sigma.c \
-	hardware/asix-sigma/asix-sigma.h
-else
-EXTRA_DIST = \
-	hardware/asix-sigma/asix-sigma.c \
-	hardware/asix-sigma/asix-sigma.h
-endif
-
-if LA_OLS
-libsigrok_la_SOURCES += hardware/openbench-logic-sniffer/ols.c
-else
-EXTRA_DIST = hardware/openbench-logic-sniffer/ols.c
-endif
-
-if LA_SALEAE_LOGIC
-libsigrok_la_SOURCES += hardware/saleae-logic/saleae-logic.c
-else
-EXTRA_DIST = hardware/saleae-logic/saleae-logic.c
-endif
+	strutil.c
 
-if LA_ZEROPLUS_LOGIC_CUBE
-libsigrok_la_SOURCES += \
-	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
-else
-EXTRA_DIST = \
-	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
-endif
+libsigrok_la_LIBADD = \
+	$(LIBOBJS) \
+	hardware/libsigrokhardware.la \
+	input/libsigrokinput.la \
+	output/libsigrokoutput.la
 
-libsigrok_la_LIBADD = $(LIBOBJS)
+libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
 
-include_HEADERS = sigrok.h
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc