Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/server/drivers instead of including xorg-s...



details:   https://anonhg.NetBSD.org/src/rev/25e334d59967
branches:  trunk
changeset: 347274:25e334d59967
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 20 00:22:02 2016 +0000

description:
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.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver  |  6 +++++-
 external/mit/xorg/server/drivers/fake-include/config.h |  7 +++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r bdc9e1b5d247 -r 25e334d59967 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Fri Aug 19 23:51:44 2016 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Sat Aug 20 00:22:02 2016 +0000
@@ -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 @@
 .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>
diff -r bdc9e1b5d247 -r 25e334d59967 external/mit/xorg/server/drivers/fake-include/config.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/drivers/fake-include/config.h    Sat Aug 20 00:22:02 2016 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index