X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fcommon%2FMakefile.am;h=ca717510d5fb0796f95b5cd5c561cd9ba0549e44;hb=b979d0c9cbf3a697c0ac4b06031ffb18b5f60006;hp=3dd32b0d598269b1e979fc86961ebe16e2f840d3;hpb=79081ec80c79801c439a1a3756cf5426af0739b8;p=libsigrok.git diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am index 3dd32b0d..ca717510 100644 --- a/hardware/common/Makefile.am +++ b/hardware/common/Makefile.am @@ -1,5 +1,5 @@ ## -## This file is part of the sigrok project. +## This file is part of the libsigrok project. ## ## Copyright (C) 2011 Uwe Hermann ## @@ -20,22 +20,16 @@ SUBDIRS = dmm # Local lib, this is NOT meant to be installed! -noinst_LTLIBRARIES = libsigrokhwcommon.la +noinst_LTLIBRARIES = libsigrok_hw_common.la -libsigrokhwcommon_la_SOURCES = +libsigrok_hw_common_la_SOURCES = serial.c -if NEED_EZUSB -libsigrokhwcommon_la_SOURCES += ezusb.c +if NEED_USB +libsigrok_hw_common_la_SOURCES += ezusb.c usb.c endif -if NEED_SERIAL -libsigrokhwcommon_la_SOURCES += serial.c -endif - -libsigrokhwcommon_la_LIBADD = - -libsigrokhwcommon_la_LIBADD += dmm/libsigrok_hw_common_dmm.la +libsigrok_hw_common_la_LIBADD = dmm/libsigrok_hw_common_dmm.la -libsigrokhwcommon_la_CFLAGS = \ +libsigrok_hw_common_la_CFLAGS = \ -I$(top_srcdir)