Module Name: src
Committed By: joerg
Date: Wed Jan 7 20:42:02 UTC 2015
Modified Files:
src: Makefile
src/external/mit: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/tools: Makefile
src/external/mit/xorg/tools/makestrs: Makefile
src/tools: Makefile
Log Message:
Reorganise the way xorg is build. Move build of makestrs into src/tools
as it is needed for the "includes" phase. Make it symlink all necessary
headers in obj to decouple it from "includes" itself, breaking the
dependency cycle. Move the do-x11 target between do-lib and do-build, so
that libraries can get the benefit of build_install (correct .WAIT
behavior) and everything else like "includes" uses the plain SUBDIR
entry in external/mit.
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/Makefile
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/makestrs/Makefile
cvs rdiff -u -r1.179 -r1.180 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.311 src/Makefile:1.312
--- src/Makefile:1.311 Wed Nov 5 08:19:17 2014
+++ src/Makefile Wed Jan 7 20:42:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.311 2014/11/05 08:19:17 snj Exp $
+# $NetBSD: Makefile,v 1.312 2015/01/07 20:42:01 joerg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -231,10 +231,10 @@ BUILDTARGETS+= includes
.endif
BUILDTARGETS+= do-lib
BUILDTARGETS+= do-compat-lib
-BUILDTARGETS+= do-build
.if ${MKX11} != "no"
BUILDTARGETS+= do-x11
.endif
+BUILDTARGETS+= do-build
.if ${MKEXTSRC} != "no"
BUILDTARGETS+= do-extsrc
.endif
@@ -479,7 +479,8 @@ do-build: .PHONY .MAKE
do-x11: .PHONY .MAKE
.if ${MKX11} != "no"
.if ${X11FLAVOUR} == "Xorg"
- ${MAKEDIRTARGET} external/mit/xorg build
+ ${MAKEDIRTARGET} external/mit/xorg/tools all
+ ${MAKEDIRTARGET} external/mit/xorg/lib build_install
.else
${MAKEDIRTARGET} x11 build
.endif
Index: src/external/mit/Makefile
diff -u src/external/mit/Makefile:1.2 src/external/mit/Makefile:1.3
--- src/external/mit/Makefile:1.2 Wed Feb 29 20:07:55 2012
+++ src/external/mit/Makefile Wed Jan 7 20:42:01 2015
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/02/29 20:07:55 tron Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/07 20:42:01 joerg Exp $
+
+.include <bsd.own.mk>
SUBDIR+= expat lua
+.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+SUBDIR+= xorg
+.endif
+
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.31 src/external/mit/xorg/lib/Makefile:1.32
--- src/external/mit/xorg/lib/Makefile:1.31 Mon Jan 5 03:45:31 2015
+++ src/external/mit/xorg/lib/Makefile Wed Jan 7 20:42:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/01/05 03:45:31 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2015/01/07 20:42:01 joerg Exp $
# build libraries for xorg
@@ -35,4 +35,5 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
libXdmGreet \
xcb-util
+.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/tools/Makefile
diff -u src/external/mit/xorg/tools/Makefile:1.4 src/external/mit/xorg/tools/Makefile:1.5
--- src/external/mit/xorg/tools/Makefile:1.4 Wed Jul 9 20:22:56 2014
+++ src/external/mit/xorg/tools/Makefile Wed Jan 7 20:42:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2015/01/07 20:42:01 joerg Exp $
.include <bsd.own.mk>
@@ -14,4 +14,5 @@ SUBDIR+= makestrs .WAIT
SUBDIR+=bdftopcf fc-cache ucs2any
SUBDIR+=makekeys mkfontscale .WAIT xkbcomp
+.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.1.1.1 src/external/mit/xorg/tools/makestrs/Makefile:1.2
--- src/external/mit/xorg/tools/makestrs/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/tools/makestrs/Makefile Wed Jan 7 20:42:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/07 20:42:02 joerg Exp $
NOMAN= 1
@@ -7,12 +7,20 @@ NOMAN= 1
.PATH: ${X11SRCDIR.Xt}/util
HOSTPROG= makestrs
-HOST_CPPFLAGS+= -I. -I${DESTDIR}${X11INCDIR}
+HOST_CPPFLAGS+= -I.
-# Can't use -I${DESTDIR}${X11INCDIR} since pswrap is needed
-# to create some header files.
-#
-BUILDSYMLINKS= ${X11SRCDIR.Xt}/include/X11 X11
-DPSRCS+= X11
+.for header in Xos.h Xosdefs.h Xarch.h
+realdepend realall: X11/${header}
+
+X11/${header}:
+ mkdir -p X11
+ rm -f ${header}
+ ln -s ${X11SRCDIR.xproto}/${header} X11/${header}
+.endfor
+
+clean_headers: .PHONY
+ rm -rf X11
+
+cleandir: clean_headers
.include <bsd.hostprog.mk>
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.179 src/tools/Makefile:1.180
--- src/tools/Makefile:1.179 Fri Dec 5 01:50:47 2014
+++ src/tools/Makefile Wed Jan 7 20:42:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2014/12/05 01:50:47 pooka Exp $
+# $NetBSD: Makefile,v 1.180 2015/01/07 20:42:02 joerg Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -211,6 +211,10 @@ SUBDIR+= elftosb
SUBDIR+= mkubootimage
.endif
+.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+SUBDIR+= ../external/mit/xorg/tools/makestrs
+.endif
+
.endif # TOOLCHAIN_BUILDRUMP
check_MKTOOLS: .PHONY .NOTMAIN
