X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=c01801e40fd72ee906162a09ac3122629b749d9e;hb=da0918aae0d43ab25cb72ddf8773831f0364ebdb;hp=e0d0a4afc1a285c21c480a6dbce1c8712364a6f1;hpb=e2ad47b5b0ad98fc99579d4cd9ebee7db2a03d82;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index e0d0a4af..c01801e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,25 @@
-## 
+##
 ## This file is part of the sigrok project.
-## 
+##
 ## Copyright (C) 2010 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
 ## the Free Software Foundation, either version 3 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## 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
+
+SUBDIRS = hardware input output firmware
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -27,23 +28,24 @@ 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/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_text.c \
-	output/output_vcd.c \
-	output/output_gnuplot.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 = $(SIGROK_LT_LDFLAGS)
+
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc