fx2lafw: Devices now retain the same PID/VID after fw load

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index df0e9de48c570ff49bd829381ba3e53e623c4148..46b319d91fc32f74cd9c13fbc9e7bcf3eff6f7c5 100644 (file)
--- 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,12 +17,13 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
+ACLOCAL_AMFLAGS = -I autostuff
 
-SUBDIRS = hardware input output firmware
+AM_CPPFLAGS = -I$(top_srcdir)
 
-# lib_LTLIBRARIES = libsigrok.la
-noinst_LTLIBRARIES = libsigrok.la
+SUBDIRS = contrib hardware input output firmware
+
+lib_LTLIBRARIES = libsigrok.la
 
 libsigrok_la_SOURCES = \
        backend.c \
@@ -31,9 +32,10 @@ libsigrok_la_SOURCES = \
        session.c \
        session_file.c \
        session_driver.c \
-       hwplugin.c \
+       hwdriver.c \
        filter.c \
-       strutil.c
+       strutil.c \
+       log.c
 
 libsigrok_la_LIBADD = \
        $(LIBOBJS) \
@@ -41,12 +43,13 @@ libsigrok_la_LIBADD = \
        input/libsigrokinput.la \
        output/libsigrokoutput.la
 
-libsigrok_la_LDFLAGS = $(SIGROK_LT_LDFLAGS)
+libsigrok_la_LDFLAGS = $(LIBSIGROK_LT_LDFLAGS)
+
+include_HEADERS = sigrok.h sigrok-proto.h
+noinst_HEADERS = sigrok-internal.h
 
-# 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
 
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libsigrok.pc
+EXTRA_DIST = Doxyfile