===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/make/Makefile	2006/04/25 11:47:43	1.39
--- src/usr.bin/make/Makefile	2007/03/18 15:37:06	1.40
***************
*** 1,16 ****
! #	$OpenBSD: Makefile,v 1.39 2006/04/25 11:47:43 espie Exp $
  
  PROG=	make
  CFLAGS+= -I${.OBJDIR} -I${.CURDIR}
  CDIAGFLAGS=-Wall -W -Wno-char-subscripts -Wstrict-prototypes -pedantic \
  	-Wmissing-prototypes
  
! CFLAGS+=-DUSE_TIMESPEC
! CFLAGS+=-DHAS_BOOL_H
! CFLAGS+=-DHAS_PATHS_H
! CFLAGS+=-DHAS_EXTENDED_GETCWD
! #CFLAGS+=-DHAS_STATS
  
  SRCS=	arch.c buf.c cmd_exec.c compat.c cond.c dir.c error.c for.c \
  	init.c job.c lowparse.c main.c make.c memory.c parse.c \
  	parsevar.c str.c stats.c suff.c targ.c timestamp.c \
--- 1,20 ----
! #	$OpenBSD: Makefile,v 1.40 2007/03/18 15:37:06 mickey Exp $
  
  PROG=	make
  CFLAGS+= -I${.OBJDIR} -I${.CURDIR}
+ HOSTCFLAGS+= -I${.OBJDIR} -I${.CURDIR}
  CDIAGFLAGS=-Wall -W -Wno-char-subscripts -Wstrict-prototypes -pedantic \
  	-Wmissing-prototypes
  
! CDEFS+=-DUSE_TIMESPEC
! CDEFS+=-DHAS_BOOL_H
! CDEFS+=-DHAS_PATHS_H
! CDEFS+=-DHAS_EXTENDED_GETCWD
! #CDEFS+=-DHAS_STATS
  
+ CFLAGS+=${CDEFS}
+ HOSTCFLAGS+=${CDEFS}
+ 
  SRCS=	arch.c buf.c cmd_exec.c compat.c cond.c dir.c error.c for.c \
  	init.c job.c lowparse.c main.c make.c memory.c parse.c \
  	parsevar.c str.c stats.c suff.c targ.c timestamp.c \
***************
*** 38,44 ****
  	${.OBJDIR}/generate 2 ${MAGICCONDSLOTS} >${.TARGET}
  
  generate: generate.c stats.c memory.c
! 	${HOSTCC} ${LDSTATIC} -o ${.TARGET} ${CFLAGS} ${.ALLSRC} ${LDADD}
  
  check: regress.o str.o memory.o buf.o
  	${CC} -o ${.TARGET} ${CFLAGS} ${.ALLSRC} ${LDADD}
--- 42,48 ----
  	${.OBJDIR}/generate 2 ${MAGICCONDSLOTS} >${.TARGET}
  
  generate: generate.c stats.c memory.c
! 	${HOSTCC} ${LDSTATIC} -o ${.TARGET} ${HOSTCFLAGS} ${.ALLSRC} ${LDADD}
  
  check: regress.o str.o memory.o buf.o
  	${CC} -o ${.TARGET} ${CFLAGS} ${.ALLSRC} ${LDADD}