Module Name: src
Committed By: mrg
Date: Sat Aug 20 00:22:03 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
Added Files:
src/external/mit/xorg/server/drivers/fake-include: config.h
Log Message:
instead of including xorg-server.h manually all over the places we
don't have a generated config.h, provide a fake one that does.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/fake-include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Aug 20 00:22:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.20 2016/08/16 06:24:03 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.21 2016/08/20 00:22:02 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -51,4 +51,8 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
+.if !exists(${X11SRCDIR.${DRIVER}}/../include)
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../fake-include
+.endif
+
.include <bsd.lib.mk>
Added files:
Index: src/external/mit/xorg/server/drivers/fake-include/config.h
diff -u /dev/null src/external/mit/xorg/server/drivers/fake-include/config.h:1.1
--- /dev/null Sat Aug 20 00:22:03 2016
+++ src/external/mit/xorg/server/drivers/fake-include/config.h Sat Aug 20 00:22:02 2016
@@ -0,0 +1,7 @@
+/* $NetBSD: config.h,v 1.1 2016/08/20 00:22:02 mrg Exp $ */
+
+/*
+ * Fake header for drivers missing generated config.h and need it for
+ * the xorg-server.h include.
+ */
+#include "xorg-server.h"
