BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build: Set local include directories in Makefile.am 

Move the include flags for files in the source tree from
configure.ac to Makefile.am where they belong.  Also use
AM_CPPFLAGS instead of CFLAGS/CXXFLAGS to make sure the
files in the build/source tree are always picked up first.

Also, remove the include/libsigrok sub-directory from the
search path, thereby making the <libsigrok/> prefix mandatory
when building libsigrok itself.  This matches the convention
already imposed on users of the library.
This commit is contained in:
Daniel Elstner 2015-08-13 01:18:51 +02:00
parent 3cd4b38174
commit c1aae90038
138 changed files with 144 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -20,7 +20,10 @@
ACLOCAL_AMFLAGS = -I autostuff ACLOCAL_AMFLAGS = -I autostuff
AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src
local_includes += -Ibindings/cxx/include -I${srcdir}/bindings/cxx/include -Ibindings/cxx
AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
lib_LTLIBRARIES = libsigrok.la lib_LTLIBRARIES = libsigrok.la
@ -585,7 +588,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
$(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS) $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
$(AM_V_at)make java-clean $(AM_V_at)make java-clean
$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \ $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
-I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $< $(local_includes) -I$(JCLS) -I. -I$(srcdir) -outdir $(JCLS) -o $@ $<
$(JJAR): $(JCXX) $(JJAR): $(JCXX)
$(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC) $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)

4
configure.ac
View File

@ -456,8 +456,8 @@ esac
AC_SUBST(SR_PKGLIBS) AC_SUBST(SR_PKGLIBS)
CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS" CFLAGS="$CFLAGS $LIB_CFLAGS"
CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS" CXXFLAGS="$CXXFLAGS $LIB_CFLAGS"
# Find Java compiler and JNI includes for Java bindings. # Find Java compiler and JNI includes for Java bindings.
AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no]) AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])

4
include/libsigrok/libsigrok.h
View File

@ -1099,8 +1099,8 @@ struct sr_serial_port {
char *description; char *description;
}; };
#include "proto.h" #include <libsigrok/proto.h>
#include "version.h" #include <libsigrok/version.h>
#ifdef __cplusplus #ifdef __cplusplus
} }

2
src/analog.c
View File

@ -21,7 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @cond PRIVATE */ /** @cond PRIVATE */

2
src/backend.c
View File

@ -20,7 +20,7 @@
#include <glib.h> #include <glib.h>
#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @cond PRIVATE */ /** @cond PRIVATE */

2
src/device.c
View File

@ -20,7 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <glib.h> #include <glib.h>
#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @cond PRIVATE */ /** @cond PRIVATE */

2
src/dmm/bm25x.c
View File

@ -24,7 +24,7 @@
*/ */
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "brymen-bm25x" #define LOG_PREFIX "brymen-bm25x"

2
src/dmm/es519xx.c
View File

@ -29,7 +29,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "es519xx" #define LOG_PREFIX "es519xx"

2
src/dmm/fs9721.c
View File

@ -35,7 +35,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "fs9721" #define LOG_PREFIX "fs9721"

2
src/dmm/fs9922.c
View File

@ -26,7 +26,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "fs9922" #define LOG_PREFIX "fs9922"

2
src/dmm/m2110.c
View File

@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "m2110" #define LOG_PREFIX "m2110"

2
src/dmm/metex14.c
View File

@ -35,7 +35,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "metex14" #define LOG_PREFIX "metex14"

2
src/dmm/rs9lcd.c
View File

@ -32,7 +32,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "rs9lcd" #define LOG_PREFIX "rs9lcd"

2
src/dmm/ut372.c
View File

@ -25,7 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "ut372" #define LOG_PREFIX "ut372"

2
src/dmm/ut71x.c
View File

@ -28,7 +28,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "ut71x" #define LOG_PREFIX "ut71x"

2
src/dmm/vc870.c
View File

@ -22,7 +22,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "vc870" #define LOG_PREFIX "vc870"

2
src/drivers.c
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @cond PRIVATE */ /** @cond PRIVATE */

2
src/error.c
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
/** /**
* @file * @file

2
src/ezusb.c
View File

@ -27,7 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "ezusb" #define LOG_PREFIX "ezusb"

2
src/fallback.c
View File

@ -19,7 +19,7 @@
#include <glib.h> #include <glib.h>
#include "config.h" #include "config.h"
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#ifndef HAVE_LIBSERIALPORT #ifndef HAVE_LIBSERIALPORT

2
src/hardware/agilent-dmm/api.c
View File

@ -22,7 +22,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "agilent-dmm.h" #include "agilent-dmm.h"

2
src/hardware/agilent-dmm/sched.c
View File

@ -21,7 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "agilent-dmm.h" #include "agilent-dmm.h"

2
src/hardware/appa-55ii/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "appa-55ii" #define LOG_PREFIX "appa-55ii"

2
src/hardware/asix-sigma/asix-sigma.c
View File

@ -28,7 +28,7 @@
#include <ftdi.h> #include <ftdi.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "asix-sigma.h" #include "asix-sigma.h"

2
src/hardware/atten-pps3xxx/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "atten-pps3xxx" #define LOG_PREFIX "atten-pps3xxx"

2
src/hardware/baylibre-acme/gpio.c
View File

@ -23,7 +23,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "gpio.h" #include "gpio.h"

2
src/hardware/baylibre-acme/protocol.h
View File

@ -23,7 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include <unistd.h> #include <unistd.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "baylibre-acme" #define LOG_PREFIX "baylibre-acme"

2
src/hardware/beaglelogic/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "beaglelogic" #define LOG_PREFIX "beaglelogic"

2
src/hardware/brymen-bm86x/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "brymen-bm86x" #define LOG_PREFIX "brymen-bm86x"

2
src/hardware/brymen-dmm/protocol.h
View File

@ -25,7 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "brymen-dmm" #define LOG_PREFIX "brymen-dmm"

2
src/hardware/cem-dt-885x/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "cem-dt-885x" #define LOG_PREFIX "cem-dt-885x"

2
src/hardware/center-3xx/protocol.h
View File

@ -26,7 +26,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "center-3xx" #define LOG_PREFIX "center-3xx"

2
src/hardware/chronovu-la/protocol.h
View File

@ -25,7 +25,7 @@
#include <ftdi.h> #include <ftdi.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "la8/la16" #define LOG_PREFIX "la8/la16"

2
src/hardware/colead-slm/api.c
View File

@ -22,7 +22,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/colead-slm/protocol.c
View File

@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/colead-slm/protocol.h
View File

@ -21,7 +21,7 @@
#define LIBSIGROK_HARDWARE_COLEAD_SLM_PROTOCOL_H #define LIBSIGROK_HARDWARE_COLEAD_SLM_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "colead-slm" #define LOG_PREFIX "colead-slm"

2
src/hardware/conrad-digi-35-cpu/protocol.h
View File

@ -29,7 +29,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "conrad-digi-35-cpu" #define LOG_PREFIX "conrad-digi-35-cpu"

2
src/hardware/demo/demo.c
View File

@ -30,7 +30,7 @@
#include <fcntl.h> #include <fcntl.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY) #define pipe(fds) _pipe(fds, 4096, _O_BINARY)
#endif #endif
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "demo" #define LOG_PREFIX "demo"

2
src/hardware/deree-de5000/api.c
View File

@ -21,7 +21,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi) static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi)

2
src/hardware/fluke-dmm/api.c
View File

@ -22,7 +22,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "fluke-dmm.h" #include "fluke-dmm.h"

2
src/hardware/fluke-dmm/fluke.c
View File

@ -21,7 +21,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "fluke-dmm.h" #include "fluke-dmm.h"

2
src/hardware/fx2lafw/protocol.h
View File

@ -26,7 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "fx2lafw" #define LOG_PREFIX "fx2lafw"

2
src/hardware/gmc-mh-1x-2x/protocol.h
View File

@ -27,7 +27,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "gmc-mh-1x-2x" #define LOG_PREFIX "gmc-mh-1x-2x"

2
src/hardware/hameg-hmo/protocol.h
View File

@ -23,7 +23,7 @@
#include <glib.h> #include <glib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "hameg-hmo" #define LOG_PREFIX "hameg-hmo"

2
src/hardware/hantek-dso/api.c
View File

@ -29,7 +29,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "dso.h" #include "dso.h"

2
src/hardware/hantek-dso/dso.c
View File

@ -22,7 +22,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "dso.h" #include "dso.h"

2
src/hardware/ikalogic-scanalogic2/protocol.h
View File

@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "ikalogic-scanalogic2" #define LOG_PREFIX "ikalogic-scanalogic2"

2
src/hardware/ikalogic-scanaplus/protocol.h
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <ftdi.h> #include <ftdi.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "ikalogic-scanaplus" #define LOG_PREFIX "ikalogic-scanaplus"

2
src/hardware/kecheng-kc-330b/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "kecheng-kc-330b" #define LOG_PREFIX "kecheng-kc-330b"

2
src/hardware/lascar-el-usb/api.c
View File

@ -19,7 +19,7 @@
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/lascar-el-usb/protocol.c
View File

@ -22,7 +22,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/lascar-el-usb/protocol.h
View File

@ -21,7 +21,7 @@
#define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H #define LIBSIGROK_HARDWARE_LASCAR_EL_USB_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "lascar-el-usb" #define LOG_PREFIX "lascar-el-usb"

2
src/hardware/link-mso19/protocol.h
View File

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <libudev.h> #include <libudev.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "link-mso19" #define LOG_PREFIX "link-mso19"

2
src/hardware/manson-hcs-3xxx/protocol.h
View File

@ -31,7 +31,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "manson-hcs-3xxx" #define LOG_PREFIX "manson-hcs-3xxx"

2
src/hardware/maynuo-m97/protocol.h
View File

@ -21,7 +21,7 @@
#define LIBSIGROK_HARDWARE_MAYNUO_M97_PROTOCOL_H #define LIBSIGROK_HARDWARE_MAYNUO_M97_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "maynuo-m97" #define LOG_PREFIX "maynuo-m97"

2
src/hardware/mic-985xx/protocol.h
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "mic-985xx" #define LOG_PREFIX "mic-985xx"

2
src/hardware/motech-lps-30x/protocol.h
View File

@ -28,7 +28,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat); SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat);

2
src/hardware/norma-dmm/protocol.h
View File

@ -25,7 +25,7 @@
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @file /** @file

2
src/hardware/openbench-logic-sniffer/protocol.h
View File

@ -23,7 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "ols" #define LOG_PREFIX "ols"

2
src/hardware/pipistrello-ols/protocol.h
View File

@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <ftdi.h> #include <ftdi.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "p-ols" #define LOG_PREFIX "p-ols"

2
src/hardware/rigol-ds/api.c
View File

@ -26,7 +26,7 @@
#include <strings.h> #include <strings.h>
#include <math.h> #include <math.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/rigol-ds/protocol.c
View File

@ -28,7 +28,7 @@
#include <ctype.h> #include <ctype.h>
#include <time.h> #include <time.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/rigol-ds/protocol.h
View File

@ -23,7 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "rigol-ds" #define LOG_PREFIX "rigol-ds"

2
src/hardware/saleae-logic16/api.c
View File

@ -24,7 +24,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/saleae-logic16/protocol.c
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/saleae-logic16/protocol.h
View File

@ -24,7 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "saleae-logic16" #define LOG_PREFIX "saleae-logic16"

2
src/hardware/scpi-pps/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "scpi-pps" #define LOG_PREFIX "scpi-pps"

2
src/hardware/serial-dmm/api.c
View File

@ -24,7 +24,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/serial-dmm/protocol.c
View File

@ -22,7 +22,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/sysclk-lwla/api.c
View File

@ -21,7 +21,7 @@
#include <libusb.h> #include <libusb.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/sysclk-lwla/lwla.c
View File

@ -19,7 +19,7 @@
#include <errno.h> #include <errno.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"
#include "lwla.h" #include "lwla.h"

2
src/hardware/sysclk-lwla/lwla.h
View File

@ -23,7 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include <libusb.h> #include <libusb.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
struct sr_usb_dev_inst; struct sr_usb_dev_inst;

2
src/hardware/sysclk-lwla/protocol.h
View File

@ -24,7 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "lwla.h" #include "lwla.h"

2
src/hardware/teleinfo/api.c
View File

@ -19,7 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/teleinfo/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "teleinfo" #define LOG_PREFIX "teleinfo"

2
src/hardware/testo/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "testo" #define LOG_PREFIX "testo"

2
src/hardware/tondaj-sl-814/api.c
View File

@ -20,7 +20,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/tondaj-sl-814/protocol.c
View File

@ -20,7 +20,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/tondaj-sl-814/protocol.h
View File

@ -22,7 +22,7 @@
#define LIBSIGROK_HARDWARE_TONDAJ_SL_814_PROTOCOL_H #define LIBSIGROK_HARDWARE_TONDAJ_SL_814_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "tondaj-sl-814" #define LOG_PREFIX "tondaj-sl-814"

2
src/hardware/uni-t-dmm/api.c
View File

@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/uni-t-dmm/protocol.c
View File

@ -20,7 +20,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/uni-t-dmm/protocol.h
View File

@ -24,7 +24,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "uni-t-dmm" #define LOG_PREFIX "uni-t-dmm"

2
src/hardware/uni-t-ut32x/protocol.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "uni-t-ut32x" #define LOG_PREFIX "uni-t-ut32x"

2
src/hardware/victor-dmm/api.c
View File

@ -21,7 +21,7 @@
#include <libusb.h> #include <libusb.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/victor-dmm/protocol.c
View File

@ -20,7 +20,7 @@
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/victor-dmm/protocol.h
View File

@ -21,7 +21,7 @@
#define LIBSIGROK_HARDWARE_VICTOR_DMM_PROTOCOL_H #define LIBSIGROK_HARDWARE_VICTOR_DMM_PROTOCOL_H
#include <stdint.h> #include <stdint.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "victor-dmm" #define LOG_PREFIX "victor-dmm"

2
src/hardware/yokogawa-dlm/protocol.h
View File

@ -26,7 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol_wrappers.h" #include "protocol_wrappers.h"

2
src/hardware/yokogawa-dlm/protocol_wrappers.h
View File

@ -23,7 +23,7 @@
#include <glib.h> #include <glib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/zeroplus-logic-cube/analyzer.c
View File

@ -30,7 +30,7 @@
*/ */
#include <assert.h> #include <assert.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "analyzer.h" #include "analyzer.h"
#include "gl_usb.h" #include "gl_usb.h"

2
src/hardware/zeroplus-logic-cube/analyzer.h
View File

@ -33,7 +33,7 @@
#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#define STATUS_FLAG_NONE 0x00 #define STATUS_FLAG_NONE 0x00
#define STATUS_FLAG_RESET 0x01 #define STATUS_FLAG_RESET 0x01

2
src/hardware/zeroplus-logic-cube/gl_usb.c
View File

@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "gl_usb.h" #include "gl_usb.h"
#include "protocol.h" #include "protocol.h"

2
src/hardware/zeroplus-logic-cube/gl_usb.h
View File

@ -33,7 +33,7 @@
#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H #define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer, SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
unsigned int size); unsigned int size);

2
src/hardware/zeroplus-logic-cube/protocol.h
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include <libusb.h> #include <libusb.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "analyzer.h" #include "analyzer.h"

2
src/hwdriver.c
View File

@ -24,7 +24,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @cond PRIVATE */ /** @cond PRIVATE */

2
src/input/binary.c
View File

@ -23,7 +23,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "input/binary" #define LOG_PREFIX "input/binary"

2
src/input/chronovu_la8.c
View File

@ -22,7 +22,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "input/chronovu-la8" #define LOG_PREFIX "input/chronovu-la8"

2
src/input/csv.c
View File

@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "input/csv" #define LOG_PREFIX "input/csv"

2
src/input/input.c
View File

@ -23,7 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
/** @cond PRIVATE */ /** @cond PRIVATE */

2
src/input/vcd.c
View File

@ -61,7 +61,7 @@
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "input/vcd" #define LOG_PREFIX "input/vcd"

2
src/input/wav.c
View File

@ -24,7 +24,7 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include "libsigrok.h" #include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#define LOG_PREFIX "input/wav" #define LOG_PREFIX "input/wav"

Some files were not shown because too many files have changed in this diff Show More