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>

diff --git a/Makefile.am b/Makefile.am
index 6c087cd..411f2ac 100644 (file)
--- 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 (file)
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -25,7 +25,6 @@
  * SOFTWARE.
  */
 
-#include "config.h"
 #include "wayland-version.h"
 
 #include <stdbool.h>