Re-enable stuff we temporarily disabled for 0.1.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2d080f868ed5676af1339d844f318e969ac5a6a1..94672f333618981728d3ecabb875824497b71356 100644 (file)
--- 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,30 +30,16 @@ libsigrok_la_SOURCES = \
        device.c \
        session.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 \
-       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
-
-libsigrok_la_LIBADD = $(LIBOBJS)
-
-include_HEADERS = sigrok.h
+       filter.c
+
+libsigrok_la_LIBADD = \
+       $(LIBOBJS) \
+       hardware/libsigrokhardware.la \
+       input/libsigrokinput.la \
+       output/libsigrokoutput.la
+
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc