diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-01-23 18:00:14 +0000 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-23 21:50:06 -0500 |
| commit | ba96983bf0f10051de35bcc3def0d542d924bb9f (patch) | |
| tree | f2ce175495292521d5c499893364763be0267f88 | |
| parent | 1a1133dcc5fb03773dfc3df3af04325245f7d67a (diff) | |
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.h | 2 | ||||
| -rw-r--r-- | include/swaybar/status_line.h | 2 | ||||
| -rw-r--r-- | sway/commands.c | 2 | ||||
| -rw-r--r-- | sway/ipc-json.c | 2 | ||||
| -rw-r--r-- | sway/ipc-server.c | 2 | ||||
| -rw-r--r-- | swaybar/i3bar.c | 2 | ||||
| -rw-r--r-- | swaybar/ipc.c | 2 | ||||
| -rw-r--r-- | swaybar/status_line.c | 2 | ||||
| -rw-r--r-- | swaymsg/main.c | 2 |
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 @@ #ifndef _SWAY_IPC_JSON_H #define _SWAY_IPC_JSON_H -#include <json-c/json.h> +#include <json.h> #include "sway/tree/container.h" #include "sway/input/input-manager.h" 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 @@ #ifndef _SWAYBAR_STATUS_LINE_H #define _SWAYBAR_STATUS_LINE_H -#include <json-c/json.h> +#include <json.h> #include <stdint.h> #include <stdio.h> #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 @@ #include <string.h> #include <strings.h> #include <stdio.h> -#include <json-c/json.h> +#include <json.h> #include "sway/commands.h" #include "sway/config.h" #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 @@ -#include <json-c/json.h> +#include <json.h> #include <libevdev/libevdev.h> #include <stdio.h> #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 @@ #include <assert.h> #include <errno.h> #include <fcntl.h> -#include <json-c/json.h> +#include <json.h> #include <stdbool.h> #include <stdint.h> #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 @@ #define _POSIX_C_SOURCE 200809L -#include <json-c/json.h> +#include <json.h> #include <linux/input-event-codes.h> #include <ctype.h> #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 @@ #include <stdio.h> #include <string.h> #include <strings.h> -#include <json-c/json.h> +#include <json.h> #include "swaybar/config.h" #include "swaybar/ipc.h" #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 @@ #define _POSIX_C_SOURCE 200809L #include <fcntl.h> #include <sys/ioctl.h> -#include <json-c/json.h> +#include <json.h> #include <stdlib.h> #include <string.h> #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 @@ #include <sys/socket.h> #include <ctype.h> #include <unistd.h> -#include <json-c/json.h> +#include <json.h> #include "stringop.h" #include "ipc-client.h" #include "log.h" |