X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=060b2cabc0d06bf0c8b54c422751cdcca5b5529c;hb=5b907f9b07b0559f7230e827e5d02589d307e727;hp=75dd31b9c7c8eae86145930adeb0e47ca751b883;hpb=4c9ffa83cf5b63445a1463af18a910a8cc786e31;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 75dd31b9..060b2cab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,24 @@
-## 
+##
 ## 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)"'
+	      -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -30,6 +30,7 @@ libsigrok_la_SOURCES = \
 	hwplugin.c \
 	filter.c \
 	hardware/common/ezusb.c \
+	hardware/common/misc.c \
 	hardware/common/serial.c \
 	hardware/openbench-logic-sniffer/ols.c \
 	hardware/saleae-logic/saleae-logic.c \
@@ -38,11 +39,29 @@ libsigrok_la_SOURCES = \
 	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
 
+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
+
 libsigrok_la_LIBADD = $(LIBOBJS)
 
 include_HEADERS = sigrok.h
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc
+