From owner-freebsd-current  Thu Jun 11 02:50:30 1998
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id CAA01642
          for freebsd-current-outgoing; Thu, 11 Jun 1998 02:50:30 -0700 (PDT)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from tortuga.com.au (issi.tortuga.com.au [203.101.253.28])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id CAA01497
          for <current@FreeBSD.ORG>; Thu, 11 Jun 1998 02:50:09 -0700 (PDT)
          (envelope-from ianh@tortuga.com.au)
Received: from frabjous.tortuga.com.au by tortuga.com.au (SMI-8.6/SMI-SVR4)
	id TAA08100; Thu, 11 Jun 1998 19:33:18 +1000
Received: (from ianh@localhost)
	by frabjous.tortuga.com.au (8.8.7/8.8.5) id TAA13726;
	Thu, 11 Jun 1998 19:30:07 +1000 (EST)
From: Ian Holland <ianh@tortuga.com.au>
Message-Id: <199806110930.TAA13726@frabjous.tortuga.com.au>
Subject: Re: src Makefile fix
To: bde@zeta.org.au (Bruce Evans)
Date: Thu, 11 Jun 1998 19:30:06 +1000 (EST)
Cc: current@FreeBSD.ORG
In-Reply-To: <199806110824.SAA27517@godzilla.zeta.org.au> from Bruce Evans at "Jun 11, 98 06:24:25 pm"
X-Mailer: ELM [version 2.4ME+ PL22 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

As Bruce Evans enscribed:
> 
> It would be better to make lex not depend on yacc -o (as it used to).
> 

Perhaps a conditional dependence on "yacc -o".  I'd like to be able to
build -current of 2.2.5, or whatever release I have installed on my main
machine.  The included patch will require users of older systems to modify
/etc/make.conf, while letting the the newer system continue as now.

The problem is that it is ugly, and as time goes on, will become a barnacle
that needs to be removed.

All this assumes that

 o being able to build -current from released versions is A Good Thing

 o "yacc -o" is here to stay

ndex: bsd.dep.mk
===================================================================
RCS file: /home/freebsd/cvs/src/share/mk/bsd.dep.mk,v
retrieving revision 1.25
diff -c -r1.25 bsd.dep.mk
*** bsd.dep.mk  1998/06/05 18:38:54     1.25
--- bsd.dep.mk  1998/06/11 09:16:34
***************
*** 55,70 ****
  SRCS:=        ${SRCS} y.tab.h
  CLEANFILES:= ${CLEANFILES} y.tab.c y.tab.h
  .elif ${YFLAGS:M-d} != ""
  .for _YH in ${_YC:S/.c/.h/}
  .ORDER: ${_YC} ${_YH}
  ${_YC} ${_YH}: ${_YSRC}
!       ${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
  SRCS:=        ${SRCS} ${_YH}
  CLEANFILES:= ${CLEANFILES} ${_YH}
  .endfor
  .else
  ${_YC}: ${_YSRC}
!       ${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
  .endif
  .endfor
  .endfor
--- 55,78 ----
  SRCS:=        ${SRCS} y.tab.h
  CLEANFILES:= ${CLEANFILES} y.tab.c y.tab.h
  .elif ${YFLAGS:M-d} != ""
+ YACCOPY ?= no
+ .if ${YACCOPY} == no
+ _YO_OPT = -o ${_YC}
+ _YO_MV =
+ .else
+ _YO_OPT =
+ _YO_MV = mv y.tab.c ${_YC}
+ .endif
  .for _YH in ${_YC:S/.c/.h/}
  .ORDER: ${_YC} ${_YH}
  ${_YC} ${_YH}: ${_YSRC}
!       ${YACC} ${YFLAGS} ${_YO_OPT} ${.ALLSRC}; ${_YO_MV}
  SRCS:=        ${SRCS} ${_YH}
  CLEANFILES:= ${CLEANFILES} ${_YH}
  .endfor
  .else
  ${_YC}: ${_YSRC}
!       ${YACC} ${YFLAGS} ${_YO_OPT} ${.ALLSRC}; ${_YO_MV}
  .endif
  .endfor
  .endfor


-- 
Ian Holland                In a world without fences,
ianh@tortuga.com.au             Who needs Gates?

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message