X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=94672f333618981728d3ecabb875824497b71356;hb=058b70353dd462ab13f3badb43f2fea697161bd7;hp=f5fb2b30a4ca730ab904415f6464da1bc6cac6d3;hpb=960a75e4741edf7d3481339897328f0ea712e2c0;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index f5fb2b30..94672f33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,8 @@
 AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \
 	      -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
+SUBDIRS = hardware input output
+
 lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
@@ -28,60 +30,16 @@ libsigrok_la_SOURCES = \
 	device.c \
 	session.c \
 	hwplugin.c \
-	filter.c \
-	hardware/common/ezusb.c \
-	hardware/common/misc.c \
-	hardware/common/serial.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
-
-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
+	filter.c
 
-libsigrok_la_LIBADD = $(LIBOBJS)
+libsigrok_la_LIBADD = \
+	$(LIBOBJS) \
+	hardware/libsigrokhardware.la \
+	input/libsigrokinput.la \
+	output/libsigrokoutput.la
 
-include_HEADERS = sigrok.h
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc