X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=e375aacec7bb8446d9a3c20b0355e5988e756b09;hb=c77ed446f2c08e2906883023c85feafa19a0ec10;hp=f5fb2b30a4ca730ab904415f6464da1bc6cac6d3;hpb=960a75e4741edf7d3481339897328f0ea712e2c0;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index f5fb2b30..e375aace 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 ##
 ## 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>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.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,72 +18,50 @@
 ## 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 tests
 
 lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
 	backend.c \
-	datastore.c \
 	device.c \
 	session.c \
-	hwplugin.c \
+	session_file.c \
+	session_driver.c \
+	hwdriver.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
+	strutil.c \
+	log.c \
+	version.c \
+	error.c \
+	std.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) \
+	hardware/libsigrokhardware.la \
+	input/libsigrokinput.la \
+	output/libsigrokoutput.la
 
-if LA_OLS
-libsigrok_la_SOURCES += hardware/openbench-logic-sniffer/ols.c
-else
-EXTRA_DIST = hardware/openbench-logic-sniffer/ols.c
-endif
+libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
-if LA_SALEAE_LOGIC
-libsigrok_la_SOURCES += hardware/saleae-logic/saleae-logic.c
-else
-EXTRA_DIST = hardware/saleae-logic/saleae-logic.c
-endif
+library_includedir = $(includedir)/libsigrok
+library_include_HEADERS = libsigrok.h proto.h version.h
+noinst_HEADERS = libsigrok-internal.h
 
-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
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsigrok.pc
 
-libsigrok_la_LIBADD = $(LIBOBJS)
+EXTRA_DIST = Doxyfile README.devices
 
-include_HEADERS = sigrok.h
+MAINTAINERCLEANFILES = ChangeLog
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libsigrok.pc
+.PHONY: ChangeLog
+ChangeLog:
+	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+
+dist-hook: ChangeLog