Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.307 retrieving revision 1.324 diff -u -p -r1.307 -r1.324 --- src/Makefile 2014/06/16 07:11:52 1.307 +++ src/Makefile 2018/05/02 07:34:44 1.324 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.307 2014/06/16 07:11:52 apb Exp $ +# $NetBSD: Makefile,v 1.324 2018/05/02 07:34:44 pgoyette Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -30,6 +30,7 @@ # NOCLEANDIR, if defined, will avoid a `make cleandir' at the start # of the `make build'. # NOINCLUDES will avoid the `make includes' usually done by `make build'. +# NOBINARIES will not build binaries, only includes and libraries # # See mk.conf(5) for more details. # @@ -64,11 +65,11 @@ # Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs # from ${DESTDIR} # iso-image: -# Create CD-ROM image in RELEASEDIR/iso. +# Create CD-ROM image in RELEASEDIR/images. # RELEASEDIR must already have been populated by `make release' # or equivalent. # iso-image-source: -# Create CD-ROM image with source in RELEASEDIR/iso. +# Create CD-ROM image with source in RELEASEDIR/images. # RELEASEDIR must already have been populated by # `make release sourcesets' or equivalent. # live-image: @@ -96,10 +97,9 @@ # if ${MKCOMPAT} != "no". # do-compat-lib: builds and installs prerequisites from compat/lib # if ${MKCOMPAT} != "no". +# do-x11: builds and installs X11 tools and libraries +# from src/external/mit/xorg if ${MKX11} != "no". # do-build: builds and installs the entire system. -# do-x11: builds and installs X11 if ${MKX11} != "no"; either -# X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg" -# or X11R6 from src/x11 # do-extsrc: builds and installs extsrc if ${MKEXTSRC} != "no". # do-obsolete: installs the obsolete sets (for the postinstall-* targets). # @@ -137,7 +137,7 @@ _SRC_TOP_OBJ_= # _SUBDIR is used to set SUBDIR, after removing directories that have # BUILD_${dir}=no, or that have no ${dir}/Makefile. # -_SUBDIR= tools lib include gnu external crypto/external bin games +_SUBDIR= tools lib include external crypto/external bin games _SUBDIR+= libexec sbin usr.bin _SUBDIR+= usr.sbin share sys etc tests compat _SUBDIR+= .WAIT rescue .WAIT distrib regress @@ -164,13 +164,14 @@ afterinstall: .PHONY .MAKE ${MAKEDIRTARGET} share/man makedb .endif .if (${MKUNPRIVED} != "no" && ${MKINFO} != "no") - ${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta + ${MAKEDIRTARGET} external/gpl2/texinfo/bin/install-info infodir-meta .endif .if !defined(NOPOSTINSTALL) ${MAKEDIRTARGET} . postinstall-check .endif -_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall +_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall \ + -m ${MACHINE} -a ${MACHINE_ARCH} _POSTINSTALL_ENV= \ AWK=${TOOL_AWK:Q} \ DB=${TOOL_DB:Q} \ @@ -180,30 +181,34 @@ _POSTINSTALL_ENV= \ SED=${TOOL_SED:Q} \ STAT=${TOOL_STAT:Q} +.if ${MKX11} != "no" +_POSTINSTALL_X11=-x ${X11SRCDIR:Q} +.endif + postinstall-check: .PHONY @echo " === Post installation checks ===" - ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi + ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi @echo " ================================" postinstall-fix: .NOTMAIN .PHONY @echo " === Post installation fixes ===" - ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix + ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix @echo " ===============================" postinstall-fix-obsolete: .NOTMAIN .PHONY @echo " === Removing obsolete files ===" - ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete + ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete + @echo " ===============================" + +postinstall-fix-obsolete_stand: .NOTMAIN .PHONY + @echo " === Removing obsolete files ===" + ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand @echo " ===============================" # # Targets (in order!) called by "make build". # -.if defined(HAVE_GCC) -BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib -BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib -.endif - BUILDTARGETS+= check-tools .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR) BUILDTARGETS+= cleandir @@ -230,14 +235,16 @@ BUILDTARGETS+= includes .endif BUILDTARGETS+= do-lib BUILDTARGETS+= do-compat-lib -BUILDTARGETS+= do-build .if ${MKX11} != "no" BUILDTARGETS+= do-x11 .endif +.if !defined(NOBINARIES) +BUILDTARGETS+= do-build .if ${MKEXTSRC} != "no" BUILDTARGETS+= do-extsrc .endif BUILDTARGETS+= do-obsolete +.endif # # Enforce proper ordering of some rules. @@ -245,7 +252,6 @@ BUILDTARGETS+= do-obsolete .ORDER: ${BUILDTARGETS} includes-lib: .PHONY includes-include includes-sys -includes-gnu: .PHONY includes-lib # # Record the values of variables that might affect the build. @@ -307,6 +313,7 @@ distribution buildworld: .PHONY .MAKE ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/" ${MAKEDIRTARGET} . postinstall-fix-obsolete + ${MAKEDIRTARGET} . postinstall-fix-obsolete_stand ${MAKEDIRTARGET} distrib/sets checkflist .endif @echo "make ${.TARGET} started at: ${START_TIME}" @@ -476,10 +483,10 @@ do-build: .PHONY .MAKE do-x11: .PHONY .MAKE .if ${MKX11} != "no" -.if ${X11FLAVOUR} == "Xorg" - ${MAKEDIRTARGET} external/mit/xorg build -.else - ${MAKEDIRTARGET} x11 build + ${MAKEDIRTARGET} external/mit/xorg/tools all + ${MAKEDIRTARGET} external/mit/xorg/lib build_install +.if ${MKCOMPATX11} != "no" + ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib" .endif .else @echo "MKX11 is not enabled" @@ -521,3 +528,4 @@ dependall-distrib depend-distrib all-dis .include .include .include +.include