Subject: Small changes to Makefiles...
To: None <netbsd-bugs@sun-lamp.cs.berkeley.edu>
From: Peter Galbavy <peter@alice.wonderland.org>
List: netbsd-bugs
Date: 11/17/1993 07:16:48
Again, my manually hacked makefiles were overwritten by the last "great
sup" and so stopped working (for me). I find that if I run "make obj"
then other things break, and *I* don't see the point - someone may...

So here are some diffs to take away the dependency on having obj
directories. Of course these will break for people who *do* use
"make obj".

I am likely to just keep these hanging around in my home area, but I
thought I would share them with you :-)

-- 
Peter Galbavy				e-mail: P.Galbavy@wonderland.org
Wonderland				  work: P.Galbavy@micromuse.co.uk

	  "And you will know exactly who you are, forever,
		by knowing what it is that you love."

*** usr.bin/tn3270/tn3270/Makefile	Mon Nov 15 21:46:20 1993
--- usr.bin/tn3270/tn3270/Makefile.orig	Mon Nov 15 21:46:00 1993
***************
*** 33,40 ****
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
  astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
! 	    ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/mkastosc
! 	${.CURDIR}/../tools/mkastosc/mkastosc ${.CURDIR}/../ctlr/hostctlr.h \
  		${.CURDIR}/../ctlr/function.h < ${.CURDIR}/../ctlr/${KBD} \
  		> ${.TARGET}
  	/bin/rm -f astosc.out
--- 33,40 ----
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
  astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
! 	    ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/obj/mkastosc
! 	${.CURDIR}/../tools/mkastosc/obj/mkastosc ${.CURDIR}/../ctlr/hostctlr.h \
  		${.CURDIR}/../ctlr/function.h < ${.CURDIR}/../ctlr/${KBD} \
  		> ${.TARGET}
  	/bin/rm -f astosc.out
***************
*** 42,62 ****
  
  disp_asc.o: asc_disp.OUT disp_asc.OUT
  CLEANFILES += asc_disp.OUT asc_disp.out disp_asc.OUT disp_asc.out
! asc_disp.OUT: ${.CURDIR}/../tools/mkastods/mkastods
! 	${.CURDIR}/../tools/mkastods/mkastods > ${.TARGET}
  	/bin/rm -f asc_disp.out
  	ln -s asc_disp.OUT asc_disp.out
! disp_asc.OUT: ${.CURDIR}/../tools/mkdstoas/mkdstoas
! 	${.CURDIR}/../tools/mkdstoas/mkdstoas > ${.TARGET}
  	/bin/rm -f disp_asc.out
  	ln -s disp_asc.OUT disp_asc.out
  
  inbound.o: kbd.OUT
  CLEANFILES += TMPfunc.out kbd.OUT kbd.out
  kbd.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} \
! 	 ${.CURDIR}/../tools/mkhits/mkhits
  	${CC} ${CFLAGS} -E ${.CURDIR}/../ctlr/function.c > TMPfunc.out
! 	${.CURDIR}/../tools/mkhits/mkhits ${.CURDIR}/../ctlr/hostctlr.h \
  		TMPfunc.out < ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
  	/bin/rm -f kbd.out
  	ln -s kbd.OUT kbd.out
--- 42,62 ----
  
  disp_asc.o: asc_disp.OUT disp_asc.OUT
  CLEANFILES += asc_disp.OUT asc_disp.out disp_asc.OUT disp_asc.out
! asc_disp.OUT: ${.CURDIR}/../tools/mkastods/obj/mkastods
! 	${.CURDIR}/../tools/mkastods/obj/mkastods > ${.TARGET}
  	/bin/rm -f asc_disp.out
  	ln -s asc_disp.OUT asc_disp.out
! disp_asc.OUT: ${.CURDIR}/../tools/mkdstoas/obj/mkdstoas
! 	${.CURDIR}/../tools/mkdstoas/obj/mkdstoas > ${.TARGET}
  	/bin/rm -f disp_asc.out
  	ln -s disp_asc.OUT disp_asc.out
  
  inbound.o: kbd.OUT
  CLEANFILES += TMPfunc.out kbd.OUT kbd.out
  kbd.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/${KBD} \
! 	 ${.CURDIR}/../tools/mkhits/obj/mkhits
  	${CC} ${CFLAGS} -E ${.CURDIR}/../ctlr/function.c > TMPfunc.out
! 	${.CURDIR}/../tools/mkhits/obj/mkhits ${.CURDIR}/../ctlr/hostctlr.h \
  		TMPfunc.out < ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
  	/bin/rm -f kbd.out
  	ln -s kbd.OUT kbd.out
***************
*** 66,78 ****
  # default.map
  # kbd.out
  
! ${.CURDIR}/../tools/mkastosc/mkastosc:
  	cd ${.CURDIR}/../tools/mkastosc; make
! ${.CURDIR}/../tools/mkastods/mkastods:
  	cd ${.CURDIR}/../tools/mkastods; make
! ${.CURDIR}/../tools/mkdstoas/mkdstoas:
  	cd ${.CURDIR}/../tools/mkdstoas; make
! ${.CURDIR}/../tools/mkhits/mkhits:
  	cd ${.CURDIR}/../tools/mkhits; make
  
  
--- 66,78 ----
  # default.map
  # kbd.out
  
! ${.CURDIR}/../tools/mkastosc/obj/mkastosc:
  	cd ${.CURDIR}/../tools/mkastosc; make
! ${.CURDIR}/../tools/mkastods/obj/mkastods:
  	cd ${.CURDIR}/../tools/mkastods; make
! ${.CURDIR}/../tools/mkdstoas/obj/mkdstoas:
  	cd ${.CURDIR}/../tools/mkdstoas; make
! ${.CURDIR}/../tools/mkhits/obj/mkhits:
  	cd ${.CURDIR}/../tools/mkhits; make
  
  
*** usr.bin/tn3270/mset/Makefile	Mon Nov 15 21:49:06 1993
--- usr.bin/tn3270/mset/Makefile.orig	Mon Nov 15 21:48:53 1993
***************
*** 19,26 ****
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
  astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
! 	    ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/mkastosc
! 	${.CURDIR}/../tools/mkastosc/mkastosc \
  		${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
  		< ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
  	/bin/rm -f astosc.out
--- 19,26 ----
  astosc.o: astosc.OUT
  CLEANFILES += astosc.OUT astosc.out
  astosc.OUT: ${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
! 	    ${.CURDIR}/../ctlr/${KBD} ${.CURDIR}/../tools/mkastosc/obj/mkastosc
! 	${.CURDIR}/../tools/mkastosc/obj/mkastosc \
  		${.CURDIR}/../ctlr/hostctlr.h ${.CURDIR}/../ctlr/function.h \
  		< ${.CURDIR}/../ctlr/${KBD} > ${.TARGET}
  	/bin/rm -f astosc.out
***************
*** 28,34 ****
  
  # astosc.out
  
! ${.CURDIR}/../tools/mkastosc/mkastosc:
  	cd ${.CURDIR}/../tools/mkastosc; make
  
  
--- 28,34 ----
  
  # astosc.out
  
! ${.CURDIR}/../tools/mkastosc/obj/mkastosc:
  	cd ${.CURDIR}/../tools/mkastosc; make
  
  
*** share/zoneinfo/Makefile	Tue Nov 16 22:23:44 1993
--- share/zoneinfo/Makefile.orig	Sun Nov  7 08:57:04 1993
***************
*** 115,131 ****
  
  posix_only: ${TDATA}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../zic -d ${TZDIR} -L /dev/null ${TDATA})
  
  right_only: leapseconds ${TDATA}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../zic -d ${TZDIR} -L leapseconds ${TDATA})
  
  other_two: leapseconds ${TDATA}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../zic -d ${TZDIR}/posix -L /dev/null ${TDATA})
  	(cd ${.CURDIR}/datfiles; \
! 	    ../zic -d ${TZDIR}/right -L leapseconds ${TDATA})
  
  posix_right: posix_only other_two
  
--- 115,131 ----
  
  posix_only: ${TDATA}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../obj/zic -d ${TZDIR} -L /dev/null ${TDATA})
  
  right_only: leapseconds ${TDATA}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../obj/zic -d ${TZDIR} -L leapseconds ${TDATA})
  
  other_two: leapseconds ${TDATA}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../obj/zic -d ${TZDIR}/posix -L /dev/null ${TDATA})
  	(cd ${.CURDIR}/datfiles; \
! 	    ../obj/zic -d ${TZDIR}/right -L leapseconds ${TDATA})
  
  posix_right: posix_only other_two
  
***************
*** 133,139 ****
  
  realinstall: ${DATA} ${REDO}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../zic -d ${TZDIR} -p ${POSIXRULES})
  	chown -R ${BINOWN}.${BINGRP} ${TZDIR}
  	chmod -R a-w ${TZDIR}
  
--- 133,139 ----
  
  realinstall: ${DATA} ${REDO}
  	(cd ${.CURDIR}/datfiles; \
! 	    ../obj/zic -d ${TZDIR} -p ${POSIXRULES})
  	chown -R ${BINOWN}.${BINGRP} ${TZDIR}
  	chmod -R a-w ${TZDIR}
  

------------------------------------------------------------------------------