diff options
author | obrien <obrien@FreeBSD.org> | 2005-05-17 17:46:29 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2005-05-17 17:46:29 +0000 |
commit | c856e4db22f5d9eccd0c696168d49ea7de6d6141 (patch) | |
tree | a3dc8c72e4de1473a7135b3e3dadb3583b6ca8b8 /lib/libstand/Makefile | |
parent | 86733f6df73da158f8f50db48bcf9ae360a8215c (diff) | |
download | FreeBSD-src-c856e4db22f5d9eccd0c696168d49ea7de6d6141.zip FreeBSD-src-c856e4db22f5d9eccd0c696168d49ea7de6d6141.tar.gz |
Don't use a patch w/in /usr/src. Programmatically change files when needed.
Diffstat (limited to 'lib/libstand/Makefile')
-rw-r--r-- | lib/libstand/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 594a948..d18c5a8 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -135,24 +135,23 @@ SRCS+= bzlib.c crctable.c decompress.c huffman.c randtable.c # decompression functionality from libz .PATH: ${.CURDIR}/../libz CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz -SRCS+= adler32.c crc32.c _infback.c _inffast.c _inflate.c \ - _inftrees.c _zutil.c _zutil.h - -# aargh -.for file in zutil.h -CLEANFILES+= _${file} _${file}.orig - -_${file}: ${file} ${file}.diff - patch -s -b .orig -o ${.TARGET} < ${.ALLSRC:M*.diff} ${.ALLSRC:M*.[ch]} -.endfor +SRCS+= adler32.c crc32.c libstand_zutil.h .for file in infback.c inffast.c inflate.c inftrees.c zutil.c +SRCS+= _${file} CLEANFILES+= _${file} _${file}: ${file} - sed "s|zutil\.h|_zutil.h|" ${.ALLSRC} > ${.TARGET} + sed "s|zutil\.h|libstand_zutil.h|" ${.ALLSRC} > ${.TARGET} .endfor +# depend on stand.h being able to be included multiple times +libstand_zutil.h: ${.CURDIR}/../libz/zutil.h + sed -e 's|<stddef.h>|"stand.h"|' \ + -e 's|<string.h>|"stand.h"|' \ + -e 's|<stdlib.h>|"stand.h"|' \ + ${.ALLSRC} > ${.TARGET} + # io routines SRCS+= closeall.c dev.c ioctl.c nullfs.c stat.c \ fstat.c close.c lseek.c open.c read.c write.c readdir.c |