diff --git a/DSView/config.h b/DSView/config.h index 8d3cc62f..6448aa67 100755 --- a/DSView/config.h +++ b/DSView/config.h @@ -29,6 +29,6 @@ #define DS_VERSION_MAJOR 1 #define DS_VERSION_MINOR 2 #define DS_VERSION_MICRO 0 -#define DS_VERSION_STRING "1.2.0" "RC4" +#define DS_VERSION_STRING "1.2.0-RC4" #endif diff --git a/libsigrok4DSL/Makefile.am b/libsigrok4DSL/Makefile.am index a22b7522..e882c0e2 100755 --- a/libsigrok4DSL/Makefile.am +++ b/libsigrok4DSL/Makefile.am @@ -20,7 +20,12 @@ ACLOCAL_AMFLAGS = -I autostuff -AM_CPPFLAGS = -I$(top_srcdir) +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I/usr/include/glib-2.0 + +export AM_CPPFLAGS + SUBDIRS = hardware input output tests @@ -45,6 +50,7 @@ libsigrok4DSL_la_LIBADD = \ hardware/libsigrok4DSLhardware.la \ input/libsigrok4DSLinput.la \ output/libsigrok4DSLoutput.la + libsigrok4DSL_la_LDFLAGS = $(SR_LIB_LDFLAGS)