summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Jan Beich <jbeich@FreeBSD.org>2019-01-23 18:00:14 +0000
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-01-23 21:50:06 -0500
commitba96983bf0f10051de35bcc3def0d542d924bb9f (patch)
treef2ce175495292521d5c499893364763be0267f88
parentMerge pull request #3504 from unraised/unraised-build-fix (diff)
downloadsway-ba96983bf0f10051de35bcc3def0d542d924bb9f.tar.gz
sway-ba96983bf0f10051de35bcc3def0d542d924bb9f.tar.zst
sway-ba96983bf0f10051de35bcc3def0d542d924bb9f.zip
Make json-c include respect pkg-config --cflags
json-c.pc contains `Cflags: -I${includedir}/json-c`, so `<json-c/json.h>` won't be found unless the parent directory is searched by default.
-rw-r--r--include/sway/ipc-json.h2
-rw-r--r--include/swaybar/status_line.h2
-rw-r--r--sway/commands.c2
-rw-r--r--sway/ipc-json.c2
-rw-r--r--sway/ipc-server.c2
-rw-r--r--swaybar/i3bar.c2
-rw-r--r--swaybar/ipc.c2
-rw-r--r--swaybar/status_line.c2
-rw-r--r--swaymsg/main.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h
index 1cbfd15d..3e584dbb 100644
--- a/include/sway/ipc-json.h
+++ b/include/sway/ipc-json.h
@@ -1,6 +1,6 @@
1#ifndef _SWAY_IPC_JSON_H 1#ifndef _SWAY_IPC_JSON_H
2#define _SWAY_IPC_JSON_H 2#define _SWAY_IPC_JSON_H
3#include <json-c/json.h> 3#include <json.h>
4#include "sway/tree/container.h" 4#include "sway/tree/container.h"
5#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
6 6
diff --git a/include/swaybar/status_line.h b/include/swaybar/status_line.h
index 957a808e..3601a11e 100644
--- a/include/swaybar/status_line.h
+++ b/include/swaybar/status_line.h
@@ -1,6 +1,6 @@
1#ifndef _SWAYBAR_STATUS_LINE_H 1#ifndef _SWAYBAR_STATUS_LINE_H
2#define _SWAYBAR_STATUS_LINE_H 2#define _SWAYBAR_STATUS_LINE_H
3#include <json-c/json.h> 3#include <json.h>
4#include <stdint.h> 4#include <stdint.h>
5#include <stdio.h> 5#include <stdio.h>
6#include <stdbool.h> 6#include <stdbool.h>
diff --git a/sway/commands.c b/sway/commands.c
index f92a5e46..dd994fa1 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -5,7 +5,7 @@
5#include <string.h> 5#include <string.h>
6#include <strings.h> 6#include <strings.h>
7#include <stdio.h> 7#include <stdio.h>
8#include <json-c/json.h> 8#include <json.h>
9#include "sway/commands.h" 9#include "sway/commands.h"
10#include "sway/config.h" 10#include "sway/config.h"
11#include "sway/criteria.h" 11#include "sway/criteria.h"
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index d72fc5db..778bf773 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1,4 +1,4 @@
1#include <json-c/json.h> 1#include <json.h>
2#include <libevdev/libevdev.h> 2#include <libevdev/libevdev.h>
3#include <stdio.h> 3#include <stdio.h>
4#include <ctype.h> 4#include <ctype.h>
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 1dce8146..d1920cfd 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -4,7 +4,7 @@
4#include <assert.h> 4#include <assert.h>
5#include <errno.h> 5#include <errno.h>
6#include <fcntl.h> 6#include <fcntl.h>
7#include <json-c/json.h> 7#include <json.h>
8#include <stdbool.h> 8#include <stdbool.h>
9#include <stdint.h> 9#include <stdint.h>
10#include <stdio.h> 10#include <stdio.h>
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c
index e938694c..da93a132 100644
--- a/swaybar/i3bar.c
+++ b/swaybar/i3bar.c
@@ -1,5 +1,5 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <json-c/json.h> 2#include <json.h>
3#include <linux/input-event-codes.h> 3#include <linux/input-event-codes.h>
4#include <ctype.h> 4#include <ctype.h>
5#include <stdlib.h> 5#include <stdlib.h>
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index bf1d0f43..1cc55b43 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -3,7 +3,7 @@
3#include <stdio.h> 3#include <stdio.h>
4#include <string.h> 4#include <string.h>
5#include <strings.h> 5#include <strings.h>
6#include <json-c/json.h> 6#include <json.h>
7#include "swaybar/config.h" 7#include "swaybar/config.h"
8#include "swaybar/ipc.h" 8#include "swaybar/ipc.h"
9#include "config.h" 9#include "config.h"
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 39ae8670..17ada40c 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -1,7 +1,7 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <fcntl.h> 2#include <fcntl.h>
3#include <sys/ioctl.h> 3#include <sys/ioctl.h>
4#include <json-c/json.h> 4#include <json.h>
5#include <stdlib.h> 5#include <stdlib.h>
6#include <string.h> 6#include <string.h>
7#include <stdio.h> 7#include <stdio.h>
diff --git a/swaymsg/main.c b/swaymsg/main.c
index 2b49f9b9..c84f5671 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -9,7 +9,7 @@
9#include <sys/socket.h> 9#include <sys/socket.h>
10#include <ctype.h> 10#include <ctype.h>
11#include <unistd.h> 11#include <unistd.h>
12#include <json-c/json.h> 12#include <json.h>
13#include "stringop.h" 13#include "stringop.h"
14#include "ipc-client.h" 14#include "ipc-client.h"
15#include "log.h" 15#include "log.h"