X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=372640ee646fd3b38a7f3fcbefddadf56995ad6a;hb=576790ff7b7e888eeefa79239ffed6d8550c1160;hp=771c55062bfcedae5a960c5a8dc5eff9ee44787f;hpb=a695d6c0751494a07493d809520d1ead9b281e7f;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 771c5506..372640ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,29 @@
-## 
+##
 ## 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
+SUBDIRS = hardware input output
+
+# lib_LTLIBRARIES = libsigrok.la
+noinst_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
 	backend.c \
@@ -28,20 +31,18 @@ libsigrok_la_SOURCES = \
 	device.c \
 	session.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.c
-
-libsigrok_la_LIBADD = $(LIBOBJS)
-
-include_HEADERS = sigrok.h
+	filter.c
+
+libsigrok_la_LIBADD = \
+	$(LIBOBJS) \
+	hardware/libsigrokhardware.la \
+	input/libsigrokinput.la \
+	output/libsigrokoutput.la
+
+# 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