update: glib.h include path

DSView/pv/data/decode/decoder.h

@@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
   
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 struct srd_decoder;
 struct srd_decoder_inst;

DSView/pv/device/devinst.h

@@ -25,7 +25,7 @@
 #include <QObject>
 
 #include <string>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <stdint.h>
 
 #include <libsigrok4DSL/libsigrok.h>

DSView/pv/devicemanager.h

@@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_DEVICEMANAGER_H
 #define DSVIEW_PV_DEVICEMANAGER_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include <list>
 #include <map>

DSView/pv/mainwindow.cpp

@@ -86,7 +86,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <list>
 #include "ui/msgbox.h"
 #include "config/appconfig.h"

DSView/pv/prop/binding/binding.h

@@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_PROP_BINDING_BINDING_H
 #define DSVIEW_PV_PROP_BINDING_BINDING_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include <vector>
 #include <map> 

DSView/pv/prop/property.h

@@ -23,7 +23,7 @@
 #ifndef DSVIEW_PV_PROP_PROPERTY_H
 #define DSVIEW_PV_PROP_PROPERTY_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include <boost/function.hpp>
 

libsigrok4DSL/backend.c

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

libsigrok4DSL/dsdevice.c

@@ -20,7 +20,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include <stdio.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
 /* Message logging helpers with subsystem-specific prefix string. */

libsigrok4DSL/hardware/DSL/command.h

@@ -20,7 +20,7 @@
 #ifndef LIBDSL_HARDWARE_COMMAND_H
 #define LIBDSL_HARDWARE_COMMAND_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 

libsigrok4DSL/hardware/DSL/dsl.h

@@ -21,7 +21,7 @@
 #ifndef LIBDSL_HARDWARE_DSL_H
 #define LIBDSL_HARDWARE_DSL_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 #include "command.h"

libsigrok4DSL/hardware/common/ezusb.c

@@ -22,7 +22,7 @@
  */
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>

libsigrok4DSL/hardware/common/usb.c

@@ -20,7 +20,7 @@
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 #include <stdlib.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /* SR_CONF_CONN takes one of these: */
 #define CONN_USB_VIDPID  "^([0-9a-z]{4})\\.([0-9a-z]{4})$"

libsigrok4DSL/hardware/demo/demo.h

@@ -21,7 +21,7 @@
 #ifndef LIBDSL_HARDWARE_DEMO_H
 #define LIBDSL_HARDWARE_DEMO_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 

libsigrok4DSL/hwdriver.c

@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
 #include "hardware/DSL/dsl.h"

libsigrok4DSL/input/in_vcd.c

@@ -60,7 +60,7 @@
 #include "../libsigrok.h"
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>

libsigrok4DSL/libsigrok-internal.h

@@ -21,7 +21,7 @@
 #define LIBSIGROK_SIGROK_INTERNAL_H
 
 //#include <stdarg.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #ifdef HAVE_LIBUSB_1_0
 #include <libusb-1.0/libusb.h>

libsigrok4DSL/libsigrok.h

@@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <zip.h>
 
 #ifdef __cplusplus

libsigrok4DSL/output/csv.c

@@ -22,7 +22,7 @@
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/csv"

libsigrok4DSL/output/gnuplot.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/gnuplot"

libsigrok4DSL/output/srzip.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>
 

libsigrok4DSL/output/vcd.c

@@ -23,7 +23,7 @@
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../config.h" /* Needed for PACKAGE and others. */
 
 #define LOG_PREFIX "output/vcd"

libsigrok4DSL/session.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "session: "

libsigrok4DSL/session_file.c

@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */
 

libsigrok4DSL/std.c

@@ -20,7 +20,7 @@
 
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /**
  * Standard sr_driver_init() API helper.

libsigrok4DSL/trigger.c

@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "session: "

libsigrokdecode4DSL/decoder.c

@@ -22,7 +22,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /**
  * @file

libsigrokdecode4DSL/exception.c

@@ -21,7 +21,7 @@
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 #include <stdarg.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 static char *py_stringify(PyObject *py_obj)
 {

libsigrokdecode4DSL/instance.c

@@ -22,7 +22,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdint.h>

libsigrokdecode4DSL/libsigrokdecode.h

@@ -23,7 +23,7 @@
 #define LIBSIGROKDECODE_LIBSIGROKDECODE_H
 
 #include <stdint.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #define DECODE_NUM_HEX_MAX_LEN		35
 

libsigrokdecode4DSL/session.c

@@ -22,7 +22,7 @@
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 #include <inttypes.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /**
  * @file

libsigrokdecode4DSL/srd.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /** @cond PRIVATE */