Disable some stuff which should not be in 0.2.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 193cccf2d71497ef02dfba8bc219f0500d831044..df0e9de48c570ff49bd829381ba3e53e623c4148 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,37 +17,36 @@
 ## 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
 
-lib_LTLIBRARIES = libsigrok.la
+SUBDIRS = hardware input output firmware
+
+# lib_LTLIBRARIES = libsigrok.la
+noinst_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
        backend.c \
        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
+
+libsigrok_la_LIBADD = \
+       $(LIBOBJS) \
+       hardware/libsigrokhardware.la \
+       input/libsigrokinput.la \
+       output/libsigrokoutput.la
+
+libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
+
+# include_HEADERS = sigrok.h sigrok-proto.h
+# noinst_HEADERS = sigrok-internal.h
+noinst_HEADERS = sigrok.h sigrok-proto.h sigrok-internal.h
+
+# pkgconfigdir = $(libdir)/pkgconfig
+# pkgconfig_DATA = libsigrok.pc