Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:42:19 UTC 2013
Modified Files:
src/sys/modules/drm2 [riastradh-drm2]: Makefile
Added Files:
src/sys/modules/drm2 [riastradh-drm2]: Makefile.inc
Log Message:
Move some drm2 module make goo into a drm2/Makefile.inc.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/sys/modules/drm2/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/drm2/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drm2/Makefile
diff -u src/sys/modules/drm2/Makefile:1.1.2.23 src/sys/modules/drm2/Makefile:1.1.2.24
--- src/sys/modules/drm2/Makefile:1.1.2.23 Wed Jul 24 02:41:58 2013
+++ src/sys/modules/drm2/Makefile Wed Jul 24 02:42:19 2013
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.2.23 2013/07/24 02:41:58 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.24 2013/07/24 02:42:19 riastradh Exp $
.include "../Makefile.inc"
+.include "Makefile.inc"
.PATH: ${S}/external/bsd/drm2/drm
.PATH: ${S}/external/bsd/drm2/linux
@@ -45,16 +46,4 @@ SRCS+= drm_stub.c
SRCS+= linux_idr.c
-CPPFLAGS+= -I${S}/external/bsd/drm2/include
-CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
-CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include
-CPPFLAGS+= -D__KERNEL__
-
-# XXX Is this the right place to set this?
-CPPFLAGS+= -DDIAGNOSTIC
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CPPFLAGS+= -DMTRR
-.endif
-
.include <bsd.kmodule.mk>
Added files:
Index: src/sys/modules/drm2/Makefile.inc
diff -u /dev/null src/sys/modules/drm2/Makefile.inc:1.1.2.1
--- /dev/null Wed Jul 24 02:42:19 2013
+++ src/sys/modules/drm2/Makefile.inc Wed Jul 24 02:42:19 2013
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile.inc,v 1.1.2.1 2013/07/24 02:42:19 riastradh Exp $
+
+# Common makefile cruft for drm2 code.
+
+CPPFLAGS+= -I${S}/external/bsd/drm2/include
+CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
+CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include
+CPPFLAGS+= -D__KERNEL__
+
+# XXX Is this the right place to set this?
+CPPFLAGS+= -DDIAGNOSTIC
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DMTRR
+.endif
