summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.com>2019-03-11 17:05:33 +0200
committerSimon Ser <contact@emersion.fr>2020-01-10 23:42:59 +0100
commit0d3044f2eaf66f2d87edad3c9545b9e1936f2019 (patch)
treeb6047794b169099f68532bbacd2d363f841cebb3
parenta77f6bf6c41f83520261cdf67c9819f8e36f8a3d (diff)
scanner: include config.h from command line
Meson will need to build wayland-scanner twice with different config.h files, once for build and another for host machine. It will be easier to include the right config.h from compiler command line than playing with files. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
-rw-r--r--Makefile.am1
-rw-r--r--src/scanner.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6c087cd..411f2ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ pkgconfig_DATA =
bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = src/scanner.c
+wayland_scanner_CPPFLAGS = $(AM_CPPFLAGS) -include config.h
wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
pkgconfig_DATA += src/wayland-scanner.pc
diff --git a/src/scanner.c b/src/scanner.c
index 2b3adbd..b470c91 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -25,7 +25,6 @@
* SOFTWARE.
*/
-#include "config.h"
#include "wayland-version.h"
#include <stdbool.h>