Date: Thu, 28 May 2009 07:22:12 +0000 (UTC) From: John Birrell <jb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r192967 - in projects/jbuild/usr.bin: . jbuild jdirdep make Message-ID: <200905280722.n4S7MCIL026903@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jb Date: Thu May 28 07:22:11 2009 New Revision: 192967 URL: http://svn.freebsd.org/changeset/base/192967 Log: Add Buildfiles for make, jbuild and jdirdep/jgetsrc Added: projects/jbuild/usr.bin/jbuild/Buildfile projects/jbuild/usr.bin/jbuild/Buildfile.dep projects/jbuild/usr.bin/jbuild/Buildfile.dirdep projects/jbuild/usr.bin/jdirdep/Buildfile projects/jbuild/usr.bin/jdirdep/Buildfile.common projects/jbuild/usr.bin/jdirdep/Buildfile.dep projects/jbuild/usr.bin/jdirdep/Buildfile.dirdep projects/jbuild/usr.bin/make/Buildfile projects/jbuild/usr.bin/make/Buildfile.dep projects/jbuild/usr.bin/make/Buildfile.dirdep Modified: projects/jbuild/usr.bin/Buildfile projects/jbuild/usr.bin/Buildfile.dirdep Modified: projects/jbuild/usr.bin/Buildfile ============================================================================== --- projects/jbuild/usr.bin/Buildfile Thu May 28 07:20:52 2009 (r192966) +++ projects/jbuild/usr.bin/Buildfile Thu May 28 07:22:11 2009 (r192967) @@ -79,6 +79,8 @@ SUBDIR = \ indent \ ipcrm \ ipcs \ + jbuild \ + jdirdep \ join \ jot \ kdump \ Modified: projects/jbuild/usr.bin/Buildfile.dirdep ============================================================================== --- projects/jbuild/usr.bin/Buildfile.dirdep Thu May 28 07:20:52 2009 (r192966) +++ projects/jbuild/usr.bin/Buildfile.dirdep Thu May 28 07:22:11 2009 (r192967) @@ -546,6 +546,20 @@ dirdep := ${.SRCTOP}/usr.bin/ipcs/Buildf .endif .endif +dirdep := ${.SRCTOP}/usr.bin/jbuild/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/usr.bin/jdirdep/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + dirdep := ${.SRCTOP}/usr.bin/join/Buildfile.dirdep .if empty(.MAKEFILE_LIST:M${dirdep}) .if exists(${dirdep}) @@ -2164,6 +2178,20 @@ D_TGTS_${_t}:= ${D_TGTS_${_t}} .endfor .endif +.if exists(${.SRCTOP}/usr.bin/jbuild/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/usr.bin/jbuild/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/usr.bin/jdirdep/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/usr.bin/jdirdep/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + .if exists(${.SRCTOP}/usr.bin/join/Buildfile.dirdep) .for _t in ${_MACHINE_LIST} D_TGTS_${_t}+= ${.OBJROOT}/${_t}/usr.bin/join/all Added: projects/jbuild/usr.bin/jbuild/Buildfile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jbuild/Buildfile Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,44 @@ +# $FreeBSD$ + +.PATH: ${BSDSRCTOP}/usr.bin/make + +PROG = jbuild + +HOSTPROG = + +SRCS = \ + arch.c \ + buf.c \ + cond.c \ + dir.c \ + for.c \ + hash.c \ + hash_tables.c \ + job.c \ + lst.c \ + main.c \ + make.c \ + parse.c \ + proc.c \ + shell.c \ + str.c \ + suff.c \ + targ.c \ + util.c \ + var.c + +WARNS ?= 6 +NO_SHARED ?= YES + +CFLAGS += -I${.CURDIR} +CFLAGS += -DMAKE_VERSION=\"5200408120\" +CFLAGS += -DDEFSHELLNAME=\"sh\" +CFLAGS += -I${.CURDIR}/filemon + +# We're building 'build', not 'make' so the behaviour is different in +# some areas like defaulting to silent. +CFLAGS += -DMAKE_IS_BUILD -DJBUILD + +.include "${BSDSRCTOP}/usr.bin/jdirdep/Buildfile.common" + +.include <bsd.prog.mk> Added: projects/jbuild/usr.bin/jbuild/Buildfile.dep ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jbuild/Buildfile.dep Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,13 @@ +# This file is automatically generated. DO NOT EDIT! + +DIRDEP = \ + stage \ + sys/sys \ + + +SRCDIRDEP = \ + usr.bin/jbuild/filemon \ + usr.bin/jdirdep \ + usr.bin/make \ + + Added: projects/jbuild/usr.bin/jbuild/Buildfile.dirdep ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jbuild/Buildfile.dirdep Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,46 @@ +# This file is automatically generated. DO NOT EDIT! +.if !defined(NODIRDEP) +dirdep := ${.SRCTOP}/stage/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/sys/sys/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +.endif + +.for t in ${MACHINE_LIST} +D_TGTS_${t}= +.endfor + +.if !defined(NODIRDEP) +_MACHINE_LIST:= ${MACHINE_LIST} +.if exists(${.SRCTOP}/stage/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/stage/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/sys/sys/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/sys/sys/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + + +.endif +.for t in ${MACHINE_LIST:Nhost} +${.OBJROOT}/${t}/usr.bin/jbuild/all : ${.OBJROOT}/host/usr.bin/jbuild/all .PHONY +.endfor +${.OBJROOT}/host/usr.bin/jbuild/all : ${D_TGTS_host} .PHONY + echo Checking ${.OBJROOT}/host/usr.bin/jbuild + cd ${.SRCTOP}/usr.bin/jbuild && MACHINE=host ${MAKE} ${.MAKEFLAGS:NMACHINE=*:N-DALLMACHINES} all Added: projects/jbuild/usr.bin/jdirdep/Buildfile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jdirdep/Buildfile Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PROG = jdirdep + +HOSTPROG = + +.include "Buildfile.common" + +WARNS = 6 + +CFLAGS += -DJDIRDEP_MAIN +CFLAGS += -DDEBUG +CFLAGS += -g +STRIP = + +RELDIR = ${STAGEDIR}/usr/bin +RELFILES = jgetsrc + +.include <bsd.prog.mk> Added: projects/jbuild/usr.bin/jdirdep/Buildfile.common ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jdirdep/Buildfile.common Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,20 @@ +# $FreeBSD$ + +.PATH: ${BSDSRCTOP}/usr.bin/jdirdep + +SRCS += jdirdep.c + +CFLAGS += -I${BSDSRCTOP}/usr.bin/jdirdep -DJDIRDEP + +.if defined(USE_SQLITE3) +CFLAGS += -DUSE_SQLITE3 -pthread +CFLAGS += -I/usr/local/include +SRCS += jdirdep_sqlite3.c +LDADD += /usr/local/lib/libsqlite3.a +.else +SRCS += jdirdep_mysql.c +MYSQL_CFLAGS != mysql_config --cflags +MYSQL_LIBS != mysql_config --libs +CFLAGS += -DUSE_MYSQL ${MYSQL_CFLAGS} +LDADD += ${MYSQL_LIBS} +.endif Added: projects/jbuild/usr.bin/jdirdep/Buildfile.dep ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jdirdep/Buildfile.dep Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,14 @@ +# This file is automatically generated. DO NOT EDIT! + +DIRDEP = \ + include \ + include/machine \ + lib/msun \ + stage \ + sys/MACHINE_ARCH/include \ + sys/sys \ + + +SRCDIRDEP = \ + + Added: projects/jbuild/usr.bin/jdirdep/Buildfile.dirdep ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/jdirdep/Buildfile.dirdep Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,105 @@ +# This file is automatically generated. DO NOT EDIT! +.if !defined(NODIRDEP) +dirdep := ${.SRCTOP}/include/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/include/machine/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/lib/msun/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/stage/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/sys/sys/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +.for t in ${MACHINE_LIST} +_d=sys/MACHINE_ARCH/include +dirdep := ${.SRCTOP}/${_d:S,MACHINE_ARCH,${MACHINE_ARCH.${t}},g}/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +.endfor +.endif + +.for t in ${MACHINE_LIST} +D_TGTS_${t}= +.endfor + +.if !defined(NODIRDEP) +_MACHINE_LIST:= ${MACHINE_LIST} +.if exists(${.SRCTOP}/include/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/include/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/include/machine/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/include/machine/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/lib/msun/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/lib/msun/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/stage/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/stage/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/sys/sys/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/sys/sys/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.for t in ${_MACHINE_LIST} +_d=sys/MACHINE_ARCH/include +.if exists(${.SRCTOP}/${_d:S,MACHINE_ARCH,${MACHINE_ARCH.${t}},g}/Buildfile.dirdep) +D_TGTS_${t}+= ${.OBJROOT}/${t}/${_d:S,MACHINE_ARCH,${MACHINE_ARCH.${t}},g}/all +D_TGTS_${t}:= ${D_TGTS_${t}} +.endif + +.endfor + +.endif +.for t in ${MACHINE_LIST} +${.OBJROOT}/${t}/usr.bin/jdirdep/all : ${D_TGTS_${t}} .PHONY + echo Checking ${.OBJROOT}/${t}/usr.bin/jdirdep + cd ${.SRCTOP}/usr.bin/jdirdep && MACHINE=${t} ${MAKE} ${.MAKEFLAGS:NMACHINE=*:N-DALLMACHINES} all +.endfor Added: projects/jbuild/usr.bin/make/Buildfile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/make/Buildfile Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,101 @@ +# $FreeBSD$ + +PROG = make + +HOSTPROG = + +SRCS = \ + arch.c \ + buf.c \ + cond.c \ + dir.c \ + for.c \ + hash.c \ + hash_tables.c \ + job.c \ + lst.c \ + main.c \ + make.c \ + parse.c \ + proc.c \ + shell.c \ + str.c \ + suff.c \ + targ.c \ + util.c \ + var.c + +WARNS ?= 6 +NO_SHARED ?= YES + +CFLAGS += -I${.CURDIR} +CFLAGS += -DMAKE_VERSION=\"5200408120\" + +LOCALBASE ?= /usr/local +MPH ?= ${LOCALBASE}/bin/mph +EMITC ?= ${LOCALBASE}/bin/emitc + +.PRECIOUS: hash + +hash: + ( echo '/*' ; \ + echo ' * DO NOT EDIT' ; \ + echo ' * $$''FreeBSD$$' ; \ + echo -n ' * auto-generated from ' ; \ + sed -nEe '/\$$FreeBSD/s/^.*\$$(.*)\$$.*$$/\1/p' \ + ${.CURDIR}/parse.c ; \ + echo ' * DO NOT EDIT' ; \ + echo ' */' ; \ + echo '#include <sys/types.h>' ; \ + echo ; \ + echo '#include "hash_tables.h"' ; \ + echo ; \ + cat ${.CURDIR}/parse.c | sed \ + -e '1,/DIRECTIVES-START-TAG/d' \ + -e '/DIRECTIVES-END-TAG/,$$d' \ + -e 's/^[^"]*"\([^"]*\)".*$$/\1/' | \ + ${MPH} -d2 -m1 | ${EMITC} -l -s | \ + sed \ + -e 's/^static int g\[\]/static const signed char directive_g[]/' \ + -e 's/^static int T0\[\]/static const u_char directive_T0[]/' \ + -e 's/^static int T1\[\]/static const u_char directive_T1[]/' \ + -e '/^#define uchar unsigned char/d' \ + -e 's/uchar/u_char/g' \ + -e 's/^hash(/directive_hash(/' \ + -e 's/; \*kp;/; kp < key + len;/' \ + -e 's/int len)/size_t len)/' \ + -e 's/= T0\[/= directive_T0\[/' \ + -e 's/= T1\[/= directive_T1\[/' \ + -e 's/g\[f/directive_g[f/g' ; \ + cat ${.CURDIR}/parse.c | sed \ + -e '1,/KEYWORD-START-TAG/d' \ + -e '/KEYWORD-END-TAG/,$$d' \ + -e 's/^[^"]*"\([^"]*\)".*$$/\1/' | \ + ${MPH} -d2 -m1 | ${EMITC} -l -s | \ + sed \ + -e 's/^static int g\[\]/static const signed char keyword_g[]/' \ + -e 's/^static int T0\[\]/static const u_char keyword_T0[]/' \ + -e 's/^static int T1\[\]/static const u_char keyword_T1[]/' \ + -e '/^#define uchar unsigned char/d' \ + -e 's/uchar/u_char/g' \ + -e 's/^hash(/keyword_hash(/' \ + -e 's/int len)/size_t len)/' \ + -e 's/= T0\[/= keyword_T0\[/' \ + -e 's/= T1\[/= keyword_T1\[/' \ + -e 's/g\[f/keyword_g[f/g' \ + ) > ${.CURDIR}/hash_tables.c + +# Set the shell which make(1) uses. Bourne is the default, but a decent +# Korn shell works fine, and much faster. Using the C shell for this +# will almost certainly break everything, but it's Unix tradition to +# allow you to shoot yourself in the foot if you want to :-) + +MAKE_SHELL ?= sh + +.if ${MAKE_SHELL} == "csh" || ${MAKE_SHELL} == "sh" || ${MAKE_SHELL} == "ksh" +CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\" +.else +.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." +.endif + +.include <bsd.prog.mk> Added: projects/jbuild/usr.bin/make/Buildfile.dep ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/make/Buildfile.dep Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,10 @@ +# This file is automatically generated. DO NOT EDIT! + +DIRDEP = \ + stage \ + sys/sys \ + + +SRCDIRDEP = \ + + Added: projects/jbuild/usr.bin/make/Buildfile.dirdep ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/jbuild/usr.bin/make/Buildfile.dirdep Thu May 28 07:22:11 2009 (r192967) @@ -0,0 +1,46 @@ +# This file is automatically generated. DO NOT EDIT! +.if !defined(NODIRDEP) +dirdep := ${.SRCTOP}/stage/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +dirdep := ${.SRCTOP}/sys/sys/Buildfile.dirdep +.if empty(.MAKEFILE_LIST:M${dirdep}) +.if exists(${dirdep}) +.include "${dirdep}" +.endif +.endif + +.endif + +.for t in ${MACHINE_LIST} +D_TGTS_${t}= +.endfor + +.if !defined(NODIRDEP) +_MACHINE_LIST:= ${MACHINE_LIST} +.if exists(${.SRCTOP}/stage/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/stage/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + +.if exists(${.SRCTOP}/sys/sys/Buildfile.dirdep) +.for _t in ${_MACHINE_LIST} +D_TGTS_${_t}+= ${.OBJROOT}/${_t}/sys/sys/all +D_TGTS_${_t}:= ${D_TGTS_${_t}} +.endfor +.endif + + +.endif +.for t in ${MACHINE_LIST:Nhost} +${.OBJROOT}/${t}/usr.bin/make/all : ${.OBJROOT}/host/usr.bin/make/all .PHONY +.endfor +${.OBJROOT}/host/usr.bin/make/all : ${D_TGTS_host} .PHONY + echo Checking ${.OBJROOT}/host/usr.bin/make + cd ${.SRCTOP}/usr.bin/make && MACHINE=host ${MAKE} ${.MAKEFLAGS:NMACHINE=*:N-DALLMACHINES} all
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905280722.n4S7MCIL026903>