sr/srd: Move some files to their resp. dirs.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5fb2b30a4ca730ab904415f6464da1bc6cac6d3..24e88d8c63e43f7f5dacd224fa5654944f8b480c 100644 (file)
--- 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 m4
+
+AM_CPPFLAGS = -I$(top_srcdir)/libsigrok
+
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -27,61 +30,23 @@ 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 \
-       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 \
+       log.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