X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=46b319d91fc32f74cd9c13fbc9e7bcf3eff6f7c5;hb=97fbf6704e5876f3cfbc519f05acaa2af65a6ff0;hp=7445300729937d7ad062aa136811facfa1807cd2;hpb=62c820258238485d3352f4a68a65d299b136b792;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 74453007..46b319d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -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 autostuff
+
+AM_CPPFLAGS = -I$(top_srcdir)
+
+SUBDIRS = contrib hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -27,25 +30,26 @@ libsigrok_la_SOURCES = \
 	datastore.c \
 	device.c \
 	session.c \
-	hwplugin.c \
+	session_file.c \
+	session_driver.c \
+	hwdriver.c \
 	filter.c \
-	hardware/common/ezusb.c \
-	hardware/common/serial.c \
-	hardware/openbench-logic-sniffer/ols.c \
-	hardware/saleae-logic/saleae-logic.c \
-	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 \
+	log.c
+
+libsigrok_la_LIBADD = \
+	$(LIBOBJS) \
+	hardware/libsigrokhardware.la \
+	input/libsigrokinput.la \
+	output/libsigrokoutput.la
+
+libsigrok_la_LDFLAGS = $(LIBSIGROK_LT_LDFLAGS)
+
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc
+
+EXTRA_DIST = Doxyfile